Magnus pushed new branch wip/mangoiv/cherry-pick-fix-testdir at Glasgow Haskell Compiler / GHC