More unicode testing
Merge branch 'master' into emn