Workaround for https://github.com/facebook/hhvm/issues/2509
Merge branch '2.0'