Merge branch 'dk/send-email-avoid-net-smtp-ssl-when-able' into maint