Merge branch 'preview' into wk-master
authorWerner Koch <wk@gnupg.org>
Wed, 24 May 2017 07:09:30 +0000 (09:09 +0200)
committerWerner Koch <wk@gnupg.org>
Wed, 24 May 2017 07:09:30 +0000 (09:09 +0200)

Trivial merge