am 101fb9fe: Merge "Handle _ and % in paths" into jb-dev

* commit '101fb9fe2b5001e8122e2965c115688c1f42bd63':
  Handle _ and % in paths