Merge branch 'master' into switch-to-gpgk
authorWerner Koch <wk@gnupg.org>
Fri, 12 Jul 2019 11:57:00 +0000 (13:57 +0200)
committerWerner Koch <wk@gnupg.org>
Fri, 12 Jul 2019 11:57:00 +0000 (13:57 +0200)

Trivial merge