Prepare for 1.0.4 release.
Merge branch 'release/1.0.4' into develop