Merge branch 'hotfix/0.10.1' into develop
Merge branch 'master' into develop
release 0.11.0
Merge branch 'release/0.11.0'