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

* commit '349ef893e82f37632a705f39efc47c0d440f63c7':
  Pull upstream FreeBSD revision 249810.