Merge branch 't8_template_tag'
Merge branch 'master' into t6_ajax
ticket:6 Fixed widget test
Merge branch 't6_ajax'
Merge branch 'master' into t8_template_tag