merging master into html-mail-fixes