Encode backslashes etc. that are otherwise disallowed in a URI
Merge branch 'admin'