Merge branch 'PHP-5.5' into PHP-5.6

diff --cc NEWS
index 9df8ac2af085e9ab147a3687aaed76d5fc81fb1c,8385d3e0126e5103de38e1dfa013b9e8d8c99c85..4ae2e28e8be46be9037b1bcc594f40fd8ff5bd94
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -8,7 -16,6 +8,7 @@@ PH
    . Fixed bug #67633 (A foreach on an array returned from a function not doing
      copy-on-write). (Nikita)
    . Fixed bug #51800 (proc_open on Windows hangs forever). (Anatol)
-   . Fixed bug #68188 ($a->foo .= 'test'; can leave $a->foo undefined). (Nikita)
++  . Fixed bug #68118 ($a->foo .= 'test'; can leave $a->foo undefined). (Nikita)
  
  - FPM:
    . Fixed bug #65641 (PHP-FPM incorrectly defines the SCRIPT_NAME variable