am 20516923: am 349ef893: Merge "Pull upstream FreeBSD revision 249810."

* commit '20516923f59b859f8ca1bfdb3927bc23819ecdb3':
  Pull upstream FreeBSD revision 249810.