Merge r258431 from HEAD

(Merged individually due to conflict)

Sponsored by:	The FreeBSD Foundation
Merge from HEAD at r258433

Sponsored by:	The FreeBSD Foundation