Merge ^/head@262809

Sponsored by:	The FreeBSD Foundation