Merge: rev753 (Improve wording for the impersonation email)