Version bump + CHANGES.md
Merge branch 'release/0.8.4' into develop
Bump back to 0.9.0-SNAPSHOT