Merge commit '4af44af4'
authorAndre Heinecke <aheinecke@gnupg.org>
Wed, 27 Mar 2019 11:58:12 +0000 (12:58 +0100)
committerAndre Heinecke <aheinecke@gnupg.org>
Wed, 27 Mar 2019 11:58:12 +0000 (12:58 +0100)

Trivial merge