Merge branch '1.3-rel' (8d47169c)