Fixed invalid byte sequence issue
Merge remote-tracking branch 'upstream/master'