Merge branch 'mirbsd'
authormirabilos <m@mirbsd.org>
Tue, 8 Nov 2016 23:19:56 +0000 (00:19 +0100)
committermirabilos <m@mirbsd.org>
Tue, 8 Nov 2016 23:19:56 +0000 (00:19 +0100)

Trivial merge