Merge remote-tracking branch 'origin/r3_upgrade_sue' into r3_upgrade_jen2
Changes for Rails 3 mailer