Merge branch 'master' of /home/simonmar/ghc-git/.