Import revision ffa396196c4c0fcf8a6bf4d1dd88ffb9ce531ccc from FreeBSD.

Change-Id: Ibbded2a22a581886dd43e0443e786ad867471f1c
5 files changed