Add support for Content-ID attachments, for embedding in html email
Merge branch 'master' into content_id