Merge branch 'mirbsd'
authormirabilos <m@mirbsd.org>
Fri, 21 Oct 2016 23:33:45 +0000 (01:33 +0200)
committermirabilos <m@mirbsd.org>
Fri, 21 Oct 2016 23:33:45 +0000 (01:33 +0200)

Trivial merge