Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #75318 (The parameter of UConverter::getAliases() is not optional)

diff --cc NEWS
index 0e0c844d17d96c0496166009d13a50205001193a,7079d817c0dfa1c58a612d362a64526920d40f0c..a4c0e3958e7e83325c601c525c3fab0d42a9dbed
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -17,9 -17,13 +17,13 @@@ PH
    . Fixed bug #75311 (error: 'zend_hash_key' has no member named 'arKey' in
      apache2handler). (mcarbonneaux)
  
 -- OCI8:
 -  . Fixed incorrect reference counting. (Dmitry, Tianfang Yang)
 -
 +- Hash:
 +  . Fixed bug #75303 (sha3 hangs on bigendian). (Remi)
 +
+ - Intl:
+   . Fixed bug #75318 (The parameter of UConverter::getAliases() is not
+     optional). (cmb)
+ 
  - litespeed:
    . Fixed bug #75248 (Binary directory doesn't get created when building 
      only litespeed SAPI). (petk)

diff --cc ext/intl/converter/converter.c
Simple merge