Merge branch 'master' of git://github.com/facebook/hhvm
Merge branch 'master' of github.com:oprudkyi/hhvm