Merge pull request #6461 from phadej/backport-batch-3-3.2

Cabal/Distribution/Fields/Field.hs

Cabal/Distribution/PackageDescription/Check.hs

Cabal/Distribution/Simple/Compiler.hs

Cabal/Distribution/Simple/Configure.hs

Cabal/Distribution/Simple/HaskellSuite.hs

Cabal/Distribution/Simple/Test/Log.hs

Cabal/Distribution/Simple/Utils.hs

Cabal/Distribution/Types/BuildInfo.hs

Cabal/Distribution/Types/PackageDescription.hs

Cabal/Distribution/Utils/Generic.hs

Cabal/Distribution/Utils/IOData.hs

Cabal/Distribution/Utils/Structured.hs

Cabal/doc/hcar/Cabal-201604.tex

Cabal/doc/installing-packages.rst

Cabal/tests/ParserTests/errors/big-version.cabal

Cabal/tests/ParserTests/regressions/big-version.cabal

Cabal/tests/ParserTests/regressions/big-version.expr

Cabal/tests/ParserTests/regressions/big-version.format

Cabal/tests/Test/Laws.hs

cabal-dev-scripts/cabal-dev-scripts.cabal