Use the encode method of the path
Merge remote-tracking branch 'origin/master' into virtualenv-1