Merge branch 'master' into STABLE-BRANCH-2-2
authorWerner Koch <wk@gnupg.org>
Thu, 16 Jun 2016 16:41:42 +0000 (18:41 +0200)
committerWerner Koch <wk@gnupg.org>
Thu, 16 Jun 2016 16:41:42 +0000 (18:41 +0200)
--


Trivial merge