Merge branch 'master' into next

* master:
  Fix TreeEditor.indented_short_title if get_absolute_url crashes
Remove a few unused and ugly template tag helpers