Merge branch 'origtgz'
authormirabilos <m@mirbsd.org>
Sat, 16 Dec 2017 21:14:25 +0000 (22:14 +0100)
committermirabilos <m@mirbsd.org>
Sat, 16 Dec 2017 21:14:25 +0000 (22:14 +0100)

Trivial merge