Merge branch 'master' into 1.1