Merge branch 'origtgz'
authormirabilos <m@mirbsd.org>
Wed, 6 Dec 2017 16:41:10 +0000 (17:41 +0100)
committermirabilos <m@mirbsd.org>
Wed, 6 Dec 2017 16:41:10 +0000 (17:41 +0100)

Trivial merge