Merge branch 'origtgz'
authormirabilos <m@mirbsd.org>
Sat, 2 Dec 2017 04:51:16 +0000 (05:51 +0100)
committermirabilos <m@mirbsd.org>
Sat, 2 Dec 2017 04:51:16 +0000 (05:51 +0100)

Trivial merge