Be consistant with our unicode
Merge in @schinckel's patch 90176e7c, and supporting patches to get it all going.