[#ENGINE-28: warp of Alternative was missing, also adding of embed image only works when is a multipart mixed]
Merge branch 'master' of https://github.com/mxhero/engine