Fix mailer setup.
Fix rubocop style offense.
Merge branch 'master' into gsa