Merge "bug 344 interpretation of slashes ('/') in URI"