Merge branch 'upstream-stable' into rochade
authormirabilos <tg@debian.org>
Thu, 18 Apr 2019 12:35:44 +0000 (14:35 +0200)
committermirabilos <mirabilos@evolvis.org>
Thu, 18 Apr 2019 12:35:44 +0000 (14:35 +0200)

Trivial merge