Merge T3490-proposal1 into master
authorWerner Koch <wk@gnupg.org>
Wed, 15 Nov 2017 12:10:19 +0000 (13:10 +0100)
committerWerner Koch <wk@gnupg.org>
Wed, 15 Nov 2017 12:10:19 +0000 (13:10 +0100)
--


Trivial merge