prepare for PHP 5.6 support
Merge commit '787ddf934b64e888343eb216b2b6a91006169827' into 123.07beta21

* commit '787ddf934b64e888343eb216b2b6a91006169827':
  prepare for PHP 5.6 support