Merge branch 'mirbsd'
authormirabilos <m@mirbsd.org>
Fri, 21 Oct 2016 20:36:39 +0000 (22:36 +0200)
committermirabilos <m@mirbsd.org>
Fri, 21 Oct 2016 20:36:39 +0000 (22:36 +0200)

Trivial merge