fix unicode char issue

M
Merge branch 'master' into testing