Merge branch 'hotfix-0.10.1'