add support for hhvm
Merge remote-tracking branch 'upstream/master'

* upstream/master:
  add support for hhvm