Merge branch 'PHP-7.0' into PHP-7.1

diff --cc NEWS
index 39cc57c249b03048a6701abe8c42c8401fad5ef0,3582cce48c9eb762c773992a84b667c2d3495b75..f7b3c4388562a0a6405fd05efa49ff74e2cf28cc
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -6,15 -6,13 +6,19 @@@ PH
    . Fixed bug #72813 (Segfault with __get returned by ref). (Laruence)
    . Fixed bug #72767 (PHP Segfaults when trying to expand an infinite operator).
      (Nikita)
 +  . TypeError messages for arg_info type checks will now say "must be ...
 +    or null" where the parameter or return type accepts null. (Andrea)
 +
 +- EXIF:
 +  . Fixed bug #72735 (Samsung picture thumb not read (zero size)). (Kalle, Remi)
  
 -- GD:
 -  . Fixed bug #72709 (imagesetstyle() causes OOB read for empty $styles). (cmb)
+ - FTP:
+   . Fixed bug #70195 (Cannot upload file using ftp_put to FTPES with
+     require_ssl_reuse). (Benedict Singer)
+ 
 +- mbstring:
 +  . Fixed bug #72711 (`mb_ereg` does not clear the `$regs` parameter on
 +    failure). (ju1ius)
  
  - OCI8
    . Fixed invalid handle error with Implicit Result Sets. (Chris Jones)

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