ticket:8 made use of simple_tag
Merge branch 't8_edit_link'
Merge branch 'master' into t9_print_command