Merge branch 'master' of github.com:snowleopard/shaking-up-ghc