Merge from vendor branch SENDMAIL: