Merge new pip/setuptools from 3.4