ticket:8 fix unicode
Merge branch 't8_template_tag'