More upstream conduit tweaks
Merge branch 'master' of github.com:snoyberg/http-conduit