Merge branch 1.2 into master