Merge branch 'origtgz' into wtf
authormirabilos <m@mirbsd.org>
Fri, 16 Feb 2018 16:10:23 +0000 (17:10 +0100)
committermirabilos <m@mirbsd.org>
Fri, 16 Feb 2018 16:10:23 +0000 (17:10 +0100)

Trivial merge