Merge branch 'master' of mac:ghc/git/val32/testsuite