Merge branch 'release/1.11'
Fixes #12
Merge branch 'hotfix/1.12' into develop