Merge branch 1.3-rel (22cb0dbe)