Update version number for release.
Merge branch 'release-0.4'