Better handling of encoding
Merge branch 'master' into pathogen-bundle