Sync FreeBSD Keyword
Merge branch '5.8p2'

* 5.8p2:
  Sync FreeBSD Keyword