Bump version.
Merge branch 'release/2.0.4' into develop

* release/2.0.4:
  Bump version.