Updated Changelog
Merge branch 'release/0.8.4'
Merge branch 'master' into develop