Use "uri" instead of "url"
Merge branch 'master' into deploy