Merge branch 'origtgz'
authormirabilos <m@mirbsd.org>
Tue, 25 Oct 2016 19:58:58 +0000 (21:58 +0200)
committermirabilos <m@mirbsd.org>
Tue, 25 Oct 2016 19:58:58 +0000 (21:58 +0200)

Trivial merge