Merge branch 'release' into bug-1305
authorBernhard Fröhlich <bernhard@cacert.org>
Thu, 14 Feb 2019 20:41:13 +0000 (21:41 +0100)
committerBernhard Fröhlich <bernhard@cacert.org>
Thu, 14 Feb 2019 20:41:13 +0000 (21:41 +0100)

Trivial merge