Merge branch 'master' into 1.0.x
Merge branch '1.0.x' of https://github.com/zazz/url into 1.0.x