Merge branch 'lt/mailinfo-handle-attachment-more-sanely' into maint