formatting
Merge branch 'master' into stable-ghc-snapshot