Compatibility with latest PHP
Merge commit '91e185e51ec705e68d6a88dca36037ced8ca0a10'