Need to force UTF-8 in two places
Merge branch 'master' into convert_for_gem_use