Show both editor username and ID in error emails.
Merge branch 'better-email-editor-info' into beta

* better-email-editor-info:
  Show both editor username and ID in error emails.