Merge branch 'origtgz': new upstream prerelease
authormirabilos <m@mirbsd.org>
Sat, 8 Oct 2016 18:57:12 +0000 (20:57 +0200)
committermirabilos <m@mirbsd.org>
Sat, 8 Oct 2016 18:57:12 +0000 (20:57 +0200)

Trivial merge