Upgrade pip to 1.5.2
Update changelog
Bump version
Merge branch '1.11.X'
Merge branch 'master' into develop

Conflicts:
	virtualenv.py