More fixing for Compliance with HHVM
Merge branch 'master' into live