Merge branch 'hotfix/0.5.2'
Merge branch 'develop'
Added a migration for 0.6, for users that upgrade