Merge branch 'master' into preview
authorWerner Koch <wk@gnupg.org>
Thu, 4 May 2017 06:57:41 +0000 (08:57 +0200)
committerWerner Koch <wk@gnupg.org>
Thu, 4 May 2017 06:57:41 +0000 (08:57 +0200)

Trivial merge