Merge pull request #1876 from dstufft/update-urllib3