Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix #70103: ZipArchive::addGlob ignores remove_all_path option
  news entry for PR #1430

diff --cc NEWS
index 3c8a4cf830146146a82ed48273ac8d452ef70d5a,a11d4b2cb89aace3783fd9efc811637ec60fec17..3c37416288f7966a81de10876a9f3a88f5203bdb
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -5,7 -5,10 +5,10 @@@ PH
  - Phar:
    . Fixed bug #70417 (PharData::compress() doesn't close temp file). (cmb)
  
 -19 Jan 2017 PHP 7.0.15
+ - ZIP:
+   . Fixed bug #70103 (ZipArchive::addGlob ignores remove_all_path option). (cmb)
+ 
 +19 Jan 2017, PHP 7.1.1
  
  - Core:
    . Fixed bug #73792 (invalid foreach loop hangs script). (Dmitry)

diff --cc ext/zip/php_zip.c
Simple merge