EPA: match changes from GHC T19834
EPA: match changes from GHC T19834

(cherry picked from commit 2fec1b44e0ee7e263286709aa528b4ecb99ac6c2)

haskell/haddock,haskell/haddock,haskell/haddock,haskell/haddock,haskell/haddock