Disable HHVM as it requires a bit more work to enable build
Merge remote-tracking branch 'origin/master'