Hotfix 1.1.2-1
Merge branch 'release' into develop