Sync with facebook/hhvm@6661004