Merge branch 1.1 into master