Merges branch 'release/0.5' into develop
Bumps to v0.6
Merges branch 'release/0.6'