Merge branch 'master' into STABLE-BRANCH-2-2
authorWerner Koch <wk@gnupg.org>
Thu, 14 Jul 2016 13:58:56 +0000 (15:58 +0200)
committerWerner Koch <wk@gnupg.org>
Thu, 14 Jul 2016 13:58:56 +0000 (15:58 +0200)

Trivial merge