Merge "Compat fix for HHVM on non-Linux OSs"