unicode issue
report
Merge remote-tracking branch 'upstream/master'