In Other BSDs for 2017/04/15

All done at the last minute!