Merge branch 'release' into bug-1430 bug-1430
authorBernhard Fröhlich <bernhard@cacert.org>
Wed, 13 Feb 2019 19:20:55 +0000 (20:20 +0100)
committerBernhard Fröhlich <bernhard@cacert.org>
Wed, 13 Feb 2019 19:20:55 +0000 (20:20 +0100)

Trivial merge