Updated version number and change log.
Merge branch 'release/2.0.4' into develop