Proper use of normalize()
Proper use of normalize()

(cherry picked from commit 853028f717801880a7553131b373901ee3adcf20)

MER-C/wiki-java,MER-C/wiki-java,PeterBowman/wiki-java,PeterBowman/wiki-java,PeterBowman/wiki-java,MER-C/wiki-java