Issue 3285:  Include the site name in the sender field of notification emails
Fixing mailer issues
More rebase nonsense