Merge pull request #1916 from tmccombs/release-v10.4.2