Merge branch 'jk/utf-8-can-be-spelled-differently' into maint