Merge branch 1.2 and master