Merge branch '1.3-rel' (5fdb8a1)