Merge branch '1.3-rel' (73b7fa38)