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

Trivial merge