Upgrade pip and setuptools
Bump version
Merge branch '1.11.X'

Conflicts:
	docs/news.rst
Merge branch 'master' into develop

Conflicts:
	virtualenv.py