Merge branch 'master' into dpublicsuf

Conflicts:
	Network/HTTP/Conduit.hs
	Network/HTTP/Conduit/Types.hs
	http-conduit.cabal