Merge remote-tracking branch 'GuKK/bug-1305' into bug-1305
authorBernhard Fröhlich <bernhard@cacert.org>
Sun, 18 Nov 2018 11:21:58 +0000 (12:21 +0100)
committerBernhard Fröhlich <bernhard@cacert.org>
Sun, 18 Nov 2018 11:21:58 +0000 (12:21 +0100)

Trivial merge