Revise fileencodings
Merge branch 'master' into mac