ticket:8 edit test
Merge branch 't8_template_tag'