Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix #66021 (Blank line inside empty array/object)

diff --cc NEWS
index 42c0bdf070785c4a7b546e1d83a42aacde2fd860,f571b560eef8e542a9761323bd7e10f1405a8fe3..d4311c61ccae4869bf6bfac2dc443edf4b5757c2
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -27,12 -24,24 +27,16 @@@ PH
  - FPM:
    . Fixed bug #66482 (unknown entry 'priority' in php-fpm.conf).
  
 -- mysqli:
 -  . Fixed problem in mysqli_commit()/mysqli_rollback() with second parameter
 -    (extra comma) and third parameters (lack of escaping). (Andrey)
+ - JSON:
+   . Fixed bug #66021 (Blank line inside empty array/object when
+     JSON_PRETTY_PRINT is set). (Kevin Israel)
+ 
 +- mysqlnd:
 +  . Added a new fetching mode to mysqlnd. (Andrey)
  
 -- SimpleXML:
 -  . Fixed bug #66084 (simplexml_load_string() mangles empty node name)
 -    (Anatol)
 +- PDO:
 +  . Fixed bug #66604 ('pdo/php_pdo_error.h' not copied to the include dir).
 +    (Matteo)
  
  - SQLite:
    . Fixed bug #66967 (Updated bundled libsqlite to 3.8.4.3). (Anatol)

diff --cc ext/json/json.c
Simple merge