Merge branch 'hotfix-0.6.1'