fix url
Merge branch 'upstream' into add/binary-support

Merging in the latest url module fixes