Post cabal-install-1.20.0.3 release.

Conflicts:
	Cabal/Cabal.cabal
	Cabal/Makefile
	cabal-install/cabal-install.cabal