Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64720 (SegFault on zend_deactivate)

Conflicts:
	NEWS

diff --cc NEWS
index 7a19c7b856953a1bb7a363f3139edb6886dc88b4,5bf6872bc2bed83a7c43d76b1d958eb2f6be2977..4e9ba71a345083ff9919e1dd3dc505fed567f049
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,12 -1,14 +1,13 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2013, PHP 5.4.16
 +?? ??? 2013, PHP 5.5.0 Release Candidate 2
  
  - Core:
 -  . Fixed bug #64720 (SegFault on zend_deactivate). (Dmitry)
 -  . Fixed bug #64729 (compilation failure on x32). (Gustavo)
    . Fixed bug #64660 (Segfault on memory exhaustion within function definition).
      (Stas, reported by Juha Kylmänen)
 -  . Fixed bug #64853 (Use of no longer available ini directives causes crash on
 -    TS build). (Anatol)
++  . Fixed bug #64720 (SegFault on zend_deactivate). (Dmitry)
 +  . Fixed bug #64853 (Use of no longer available ini directives causes crash
 +    on TS build). (Anatol)
  
  - Fileinfo:
    . Fixed bug #64830 (mimetype detection segfaults on mp3 file). (Anatol)

diff --cc Zend/zend_object_handlers.c
Simple merge

diff --cc Zend/zend_opcode.c
Simple merge