Merge "Fix STARTTLS handshake error in Email's SmtpSender class"