Remove all $returnNew stuff, will have to make sure the Mailer still works
Merge remote-tracking branch 'origin/1.1' into 1.1