postmkvirtualenv upgrades any setuptools
Merge branch 'master' into mac