Merge branch 'master' of /Users/benl/devel/ghc/ghc-head