Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Bugfix #74598 ftp:// ignores context

diff --cc NEWS
index ba33a3bf4e8c1a7cff706c252b0619b23d55a317,c51b14ec6af470decfdc40e9ee8dfcbd11315394..76599d7f5ed5765e2d22cd55990886c0a7d72bc7
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -14,7 -14,10 +14,10 @@@ PH
    . Fixed bug #74478 (null coalescing operator failing with SplFixedArray).
      (jhdxr)
  
 -8 Jun 2017 PHP 7.0.20
+ - FTP:
+   . Fixed bug #74598 (ftp:// wrapper ignores context arg). (Sara)
+ 
 +8 Jun 2017, PHP 7.1.6
  
  - Core:
    . Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i).

diff --cc ext/standard/ftp_fopen_wrapper.c
Simple merge