Merge ^/head@263826

Sponsored by:	The FreeBSD Foundation
Update for r263815 and r263826

Sponsored by:	The FreeBSD Foundation