Merge branch 'PHP-7.0' into PHP-7.1

diff --cc NEWS
index 4558e98d584da45f188c3001249056eca0d24fa7,daab8dcc33f5a7e90c44a8e0a4a26c21d799c95b..d7fc7134c60471c1ec274842851f275df302c6e2
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,10 -1,12 +1,12 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2017 PHP 7.0.21
 +?? ??? 2017, PHP 7.1.7
  
- 
+ - SPL:
+   . Fixed bug #74478 (null coalescing operator failing with SplFixedArray).
+     (jhdxr)
  
 -8 Jun 2017 PHP 7.0.20
 +8 Jun 2017, PHP 7.1.6
  
  - Core:
    . Fixed bug #74600 (crash (SIGSEGV) in _zend_hash_add_or_update_i).

diff --cc ext/spl/spl_fixedarray.c
Simple merge