Merge branch 'PHP-7.0' into PHP-7.1

diff --cc NEWS
index 8230e6efa7cd11e7d65895e3ec39775c4577ccb4,f215ab8dd7f0f9184a702dcaad655a74914c9642..2a57c8977cc6350f5bffb2da48fdd6b1f0d31e8a
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -22,7 -11,13 +22,13 @@@ PH
  - SPL:
    . Fixed bug #73471 (PHP freezes with AppendIterator). (jhdxr)
  
 -06 Jul 2017 PHP 7.0.21
+ - zlib:
+   . Fixed bug #73944 (dictionary option of inflate_init() does not work).
+     (wapmorgan)
+   . Expose inflate_get_status() and inflate_get_read_len() functions.
+     (Matthew Trescott)
+ 
 +06 Jul 2017, PHP 7.1.7
  
  - Core:
    . Fixed bug #74738 (Multiple [PATH=] and [HOST=] sections not properly

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