Merge branch 'hm/maint-imap-send-crlf' into maint