Fix NFC / NFD unicode normalization on Macosx
Merge remote-tracking branch 'origin/master'