(bug 5303) Merge UtfNormal rewrite. Patch by Ludovic Arnaud (YuviPanda). This is...