Relax conduit upper bound
Merge branch 'master' into yesod-1.4