Match changes required in ghc-mod
WIP
Merge branch 'ghc-mod-cradle' into speedup