Merge 3.4 into default - Upgrade setuptools to 12.0.5 and pip to 6.0.7