Bump to release 0.6.0
Merge branch 'release-0.6.0' into develop