Merge branch 'origtgz'
authormirabilos <t.glaser@tarent.de>
Sat, 2 Dec 2017 22:24:26 +0000 (23:24 +0100)
committermirabilos <t.glaser@tarent.de>
Sat, 2 Dec 2017 22:24:26 +0000 (23:24 +0100)

Trivial merge