MFH
This is the final merge from ^/head before merging this branch back to head. It's time.
Sponsored by: The FreeBSD Foundation