Merge branch 'bug-1459' into release (Emergency bugfix) release
authorBernhard Fröhlich <bernhard@cacert.org>
Mon, 15 Apr 2019 19:55:23 +0000 (21:55 +0200)
committerBernhard Fröhlich <bernhard@cacert.org>
Mon, 15 Apr 2019 19:55:23 +0000 (21:55 +0200)

Trivial merge