Merge remote-tracking branch 'aerostitch/update_welcome_email'