Merge branch 'json-tool'
authorWerner Koch <wk@gnupg.org>
Fri, 23 Mar 2018 10:31:20 +0000 (11:31 +0100)
committerWerner Koch <wk@gnupg.org>
Fri, 23 Mar 2018 10:31:20 +0000 (11:31 +0100)

Trivial merge