Sync with facebook/hhvm@0725be7
Merge pull request #15 from whatthejeff/patch-1

Sync with facebook/hhvm@0725be7