Merge branch 'PHP-5.6' of https://git.php.net/repository/php-src into PHP-5.6
remove use of zend directly, avoid leaks/bugs in modules etc
Merge branch 'master' of https://git.php.net/repository/php-src
Merge branch 'PHP-5.6'

* PHP-5.6:
  remove use of zend directly, avoid leaks/bugs in modules etc