Merge branch 'PHP-5.5' into PHP-5.6

diff --cc NEWS
index 70e74d9c396f1b21113cd48260b258e2cd926a86,a71c3fca5b5c1be792215e858097b786c38e7599..9c90f3c8fecc436a64d6320c89ee39825ca2883b
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -9,7 -9,15 +9,9 @@@ PH
    . Fixed bug #67314 (Segmentation fault in gc_remove_zval_from_buffer).
      (Dmitry)
    . Fixed bug #68652 (segmentation fault in destructor). (Dmitry)
+   . Fixed bug #69419 (Returning compatible sub generator produces a warning).
+     (Nikita)
  
 -- cURL:
 -  . Fixed bug #68739 (Missing break / control flow). (Laruence)
 -
 -- Ereg:
 -  . Fixed bug #68740 (NULL Pointer Dereference). (Laruence)
 -
  - ODBC:
    . Fixed bug #69354 (Incorrect use of SQLColAttributes with ODBC 3.0).
      (Anatol)

diff --cc Zend/zend_vm_def.h
Simple merge

diff --cc Zend/zend_vm_execute.h
Simple merge