Merge branch 'origtgz'
authormirabilos <m@mirbsd.org>
Sun, 30 Oct 2016 03:23:14 +0000 (04:23 +0100)
committermirabilos <m@mirbsd.org>
Sun, 30 Oct 2016 03:23:14 +0000 (04:23 +0100)

Trivial merge