Support Unicode on Python 2
Merge remote-tracking branch 'upstream/master'