Merge branch 'vendor/SENDMAIL'