Merge branch 'utf8-fix'