urls: minor cleanup
Merge branch 'master' into emulate