Merge branch 'release/0.5' into develop
Version bump
Merge branch 'release/0.6'