Bump version
Merge branch 'release_0.6.0' into develop