Merge branch 'master' into add_unicode