[python-pip/el6/master: 11/11] Merge branch 'master' into el6