Made usage of php_hash_environment useful by updating instead of just adding argc
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5' into PHP-5.6
Merge branch 'PHP-5.6'
fix typo
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix typo
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix typo
Merge branch 'PHP-5.6'

* PHP-5.6:
  fix typo
Fix bug #66568: the second arg for unserialize is optional.
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix bug #66568: the second arg for unserialize is optional.
Fixed bug #66604 'pdo/php_pdo_error.h' not copied to the include dir
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #66604 'pdo/php_pdo_error.h' not copied to the include dir
Fix bug #66660: use str_efree instead of efree to handle interned empty strings correctly
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix bug #66660: use str_efree instead of efree to handle interned empty strings correctly
Add str_* macros to UPGRADING.INTERNALS
Add new zend_hash_* APIs to UPGRADING.INTERNALS
Merge branch 'PHP-5.6'
Added UPGRAING notice for bug #66015 in BC break section
Merge branch 'PHP-5.6'
Fix bug #67064 in a BC safe way
You can use an optional parameter now when implementing the Countable interface
to get the $mode passed to count().