merging master into html-mail-fixes
authorHerve Saint-Amand <git@saintamh.org>
Sun, 12 Feb 2017 21:05:38 +0000 (21:05 +0000)
committerHerve Saint-Amand <git@saintamh.org>
Sun, 12 Feb 2017 21:05:38 +0000 (21:05 +0000)

Trivial merge