Sync with facebook/hhvm@0725be7