Commit
Merge remote-tracking branch 'alanz/ghc-api' into ghc-api

Conflicts:
	src/Language/Haskell/Refact/Utils.hs