Merge pull request #9905 from haskell/fix8141