Merge /Users/benl/devel/ghc/ghc-head-devel