0.6 released
Merge branch 'release-0.6' into dev