Merge r258436 from HEAD

(Merged individually due to conflict)

Sponsored by:	The FreeBSD Foundation