Make context member public
Prevents Object::__set("context", null) being called
Causes warning on HHVM, works on PHP, but is unnecessary there, too
Merge branch 'master' into hhvm