Merge From FreeBSD: