Fix issues that occured due to merging
Fix issues that occured due to merging

pfmoore/pip,techtonik/pip,xavfernandez/pip,sbidoul/pip,techtonik/pip,sbidoul/pip,xavfernandez/pip,pypa/pip,pfmoore/pip,rouge8/pip,rouge8/pip,xavfernandez/pip,pypa/pip,techtonik/pip,pradyunsg/pip,pradyunsg/pip,rouge8/pip