Merge branch '2372_mcedit_utf8_fix'