Merge branch 'jk/send-email-rtrim-mailrc-alias' into maint