version bump to 0.6
Merge branch 'release-0.6'
Merge branch 'master' into develop