Merge "update Mass Mailer"