Compute the filesystem encoding one time at the loading
Using six.PY2 instead of not six.PY3
Merge branch 'feature/optimization' into develop