ticket:4 edit test
Merge branch 't4_template_context_processor'