rermove the hack on utf-8 as it is a hammer
Merge branch 'encoding' into fix_travis