Merge "Add workaround for HHVM issue 6206"