Merging 1.0.4 release candidate into master branch.