Merge HHVM 3.4 into master

Tested. OK to merge.