hotfix 1.1
Merge branch 'hotfix-1_1' into develop
Merge branch 'develop'