fixed HHVM incompatibility
minor #428 fixed HHVM incompatibilities (fabpot)

This PR was merged into the 5.1-dev branch.

Discussion
----------

fixed HHVM incompatibilities

Commits
-------

affd2a9 fixed HHVM incompatibility