Merge branch 1.3 into master