Import from FreeBSD 11.1-RELEASE
18 files changed