Merge branch '1.3-rel' (1a2c9ee2)