Handle non-ASCII chars in path using encoding.
Merge remote-tracking branch 'origin/master' into virtualenv-1