Merge 3.4 into default, upgrading pip to 7.0.1