Merge branch 'master' into t8_template_tag
ticket:8 Fixed edit link for object
Merge branch 't8_template_tag'