bugfix: yet another encoding error
Merge branch 'master' into pathogen-bundle