Merge branch 'master' into reports++

Conflicts:
	cabal-install/Distribution/Client/Install.hs