Hotfix 0.6.1

Merge hotfix into develop.