Fix a compiler warning
Merge remote-tracking branch 'origin/fastpath'

* origin/fastpath:
  Fix a compiler warning
Merge branch 'master' of git.bro-ids.org:broccoli