Update version numbers to 5.0.4

This should be the very last PR merged before 5.0.4 is tagged.

--no-rebase