Final merge from head, before mergeing this branch back to head.
Sponsored by: The FreeBSD Foundation