Fix path encoding.
Merge commit '6df5c512cb64275f8a06275927eaf236881ecc00'

* commit '6df5c512cb64275f8a06275927eaf236881ecc00':
  Fix path encoding.