Fix HHVM binary detection
Merge branch '3.8'