Merge "Pull upstream FreeBSD revision 249810."