Fixed something that got broken in the merge :(
Merge branch 'hotfix-0.6.4' into develop