Merge "Merge branch '1.3-rel' (acdf0b6)"