Debug HHVM Issue #32
 Debug HHVM Issue #32
Debug HHVM Issue #32
Debug HHVM Issue #32
Debug HHVM Issue #32
Fix Issue #32
Fix issue #33
Fix issue #33
Merge remote-tracking branch 'upstream/master'