Merge branch 'origtgz'
authormirabilos <m@mirbsd.org>
Fri, 1 Dec 2017 22:57:48 +0000 (23:57 +0100)
committermirabilos <m@mirbsd.org>
Fri, 1 Dec 2017 22:57:48 +0000 (23:57 +0100)

Trivial merge