am 571866cd: Merge "Make locale safe paths"

* commit '571866cd42918d9227db8424667c585b8f9fdf94':
  Make locale safe paths