Merge branch 'mirbsd'
authormirabilos <m@mirbsd.org>
Tue, 28 Mar 2017 18:19:12 +0000 (20:19 +0200)
committermirabilos <m@mirbsd.org>
Tue, 28 Mar 2017 18:19:12 +0000 (20:19 +0200)

Trivial merge