Hotfix 1.1
Merge branch 'hotfix-1_1'