use sendmail again
Merge branch 'develop' into postgres