Merge branch 'GuKKDevel'
authorJan Dittberner <jandd@cacert.org>
Fri, 9 Nov 2018 16:34:19 +0000 (17:34 +0100)
committerJan Dittberner <jandd@cacert.org>
Fri, 9 Nov 2018 16:34:19 +0000 (17:34 +0100)

Trivial merge