Sendmail fix
Merge branch 'hotfix/sendmail'