Bump version to 1.0.4.
Merge remote-tracking branch 'origin/master'
Bump version to 1.0.5.