Add https://github.com/facebook/hhvm/pull/4000

Change-Id: I304e9d9261fd4a6af6b456a7938b95528cca7b22
Signed-off-by: Giuseppe Lavagetto <glavagetto@wikimedia.org>