Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Minium changes to allow PDO_OCI to build with Oracle Database 12c libraries. (note OCI8 already builds with Oracle Database 12c)
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

* 'PHP-5.5' of https://git.php.net/repository/php-src:
  - Fixed bug #60732 (php_error_docref links to invalid pages) patch by: Jakub Vrana
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - BFN
Merge branch 'PHP-5.5' of git.php.net:/php-src into PHP-5.5
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
- BFN
- Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN
Merge branch 'PHP-5.5'

* PHP-5.5:
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN
- BFN
Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4

# By Felipe Pena
# Via Felipe Pena
* 'PHP-5.4' of https://git.php.net/repository/php-src:
  - BFN
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5

# By Felipe Pena
# Via Felipe Pena
* 'PHP-5.5' of https://git.php.net/repository/php-src:
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
Merge branch 'master' of https://git.php.net/repository/php-src

# By Felipe Pena
# Via Felipe Pena (8) and Christopher Jones (3)
* 'master' of https://git.php.net/repository/php-src:
  - Fixed bug #62672 (Error on serialize of ArrayObject) patch by: lior dot k at zend dot com
  - BFN
  - Fixed bug #62964 (Possible XSS on "Registered stream filters" info) patch by: david at nnucomputerwhiz dot com
Update NEWS
Update NEWS
- Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
Merge branch 'PHP-5.4' of git.php.net:/php-src into PHP-5.4
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
  Update NEWS
  - BFN
Merge branch 'PHP-5.5'

* PHP-5.5:
  - Fixed bug #62475 (variant_* functions causes crash when null given as an argument)
  Update NEWS
  Update NEWS
  - BFN
- BFN