Finish the MFC. The project branch should now be up to date with HEAD.
Sponsored by: The FreeBSD Foundation