Merge branch 'master' into mailer2
set env variables