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