Removed specific use of PHP_QUERY_RFC1738 constant
Don't use PHP constant; use constant value instead to support hhvm
Add specific check for HHVM
Merge branch 'entity'