Merge pull request #6961 from charris/prepare-1.10.4-release

DOC: Prepare for 1.10.4 release.