Bumped version for release of 2.0.4
Merge branch 'release/2.0.4' into develop
Bumped version for develop after release.