Fix non ascii encode problem
Merge remote-tracking branch 'origin/2.0' into 2.0