Prep for release
Merge branch 'release/0.6' into develop