Merge pull request #6135 from haskell/bump-version-to-3.1

Cabal/Cabal.cabal

Cabal/ChangeLog.md

Cabal/Makefile

Cabal/doc/conf.py

appveyor.yml

cabal-install/bootstrap.sh

cabal-install/cabal-install.cabal

cabal-install/cabal-install.cabal.pp

cabal-install/changelog

cabal-testsuite/cabal-testsuite.cabal

solver-benchmarks/solver-benchmarks.cabal

travis-common.sh

travis-deploy.sh

validate.sh