fix compat for PHP ABI changes
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix compat for PHP ABI changes