Merge branch 'bc/send-email-ssl-die-message-fix' into maint