Merge branch 'coloured-core' of https://github.com/nominolo/ghc into coloured-core