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