In Other BSDs for 2018/05/12

This came together very nicely.