rm temp url
Merge branch 'master' into tidy-templates