Merge branch 'release-1.1'
Merge branch 'master' into develop