Encode the path in case it's an invalid URI.
Merge origin/master