Merge branch 'jc/utf8'