Fixed bad merge.
Fixed bad merge.

psf/requests,Bluehorn/requests,garnaat/requests,revolunet/requests,garnaat/requests,revolunet/requests,dvska/requesocks,msabramo/requests,hph86/requesocks,abueesp/requesocks