Merge branch 'hotfix'
Merge remote-tracking branch 'origin/develop'
Release: v1.11
Merge branch 'master' into develop