Merge branch '1.3-rel' (112a21c5)