Fixed handling of UTF-8 data.
Merge remote-tracking branch 'origin/master'