am 16f31d6f: Merge "Handle _ and % in paths" into jb-dev

* commit '16f31d6fbe946ce7912ee6ddddd4b3660d3e66e7':
  Handle _ and % in paths