four five six
Merge branch 'master' of https://github.com/johndbritton/ghc

Conflicts:
	new-file