Merge branch 'master' of git://git.haskell.org/ghc