Merge branch 'master' into update-ghcjs

Cabal/Cabal.cabal

Cabal/ChangeLog.md

Cabal/Distribution/Compat/ResponseFile.hs

Cabal/Distribution/InstalledPackageInfo.hs

Cabal/Distribution/Make.hs

Cabal/Distribution/ModuleName.hs

Cabal/Distribution/Package.hs

Cabal/Distribution/PackageDescription.hs

Cabal/Distribution/PackageDescription/Configuration.hs

Cabal/Distribution/Simple.hs

Cabal/Distribution/Simple/BuildPaths.hs

Cabal/Distribution/Simple/Command.hs

Cabal/Distribution/Simple/Configure.hs

Cabal/Distribution/Simple/GHC.hs

Cabal/Distribution/Simple/GHCJS.hs

Cabal/Distribution/Simple/Haddock.hs

Cabal/Distribution/Simple/InstallDirs.hs

Cabal/Distribution/Simple/InstallDirs/Internal.hs

Cabal/Distribution/Simple/LocalBuildInfo.hs

Cabal/Distribution/Simple/PackageIndex.hs