Merge master into the ghc-new-co branch