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

Trivial merge