Merge branch 'fix-export'

* fix-export:
  Fix editor_sanitised export to include the new 'deleted' column.
Merge branch 'master' into beta