Merge clarification from trunk.
Merge last-minute updates from trunk.
Set 1.0.4 version number.
Tag 1.0.4 release.