Merge branch 'mirbsd' cvs-2--1_12_13_real-18
authormirabilos <m@mirbsd.org>
Sat, 22 Oct 2016 22:47:36 +0000 (00:47 +0200)
committermirabilos <m@mirbsd.org>
Sat, 22 Oct 2016 22:47:36 +0000 (00:47 +0200)

Trivial merge