Merge branch 'origtgz'
authormirabilos <t.glaser@tarent.de>
Sun, 3 Dec 2017 02:41:15 +0000 (03:41 +0100)
committermirabilos <t.glaser@tarent.de>
Sun, 3 Dec 2017 02:41:15 +0000 (03:41 +0100)

Trivial merge