Merge branch 'master' into ghc-new-co