CHANGES for #318
Merge branch 'master' of github.com:shazow/urllib3