tweaking the invitation email
Merge remote-tracking branch 'upstream/develop' into better-custom-errors

* upstream/develop:
  tweaking the invitation email
removed commented out code