Merge orphan commit into branch 'upstream/master'

Sometime in mid-January there was a force-push to upstream's `master`
repository, making 6e202edc an orphan
commit. Unfortunately, there was a period of time when GHC's `time`
submodule referred to this commit, which means that we need to ensure it
remains accessible in the history. This merge folds this commit into the
`master` branch.