Hotfix release 0.6.1
Merge branch 'hotfixes/0.6.1'
Merge branch 'master' into develop