Fix UTF-8 mapping of one character
Merge remote-tracking branch 'origin/master'