Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #77147: Fix for 60494 ignores ICONV_MIME_DECODE_CONTINUE_ON_ERROR

diff --cc NEWS
index cb22af2c778173af614614dc7ece3d78b709a701,dbb7c1fff92c628aa9701485abac7b35f7d6a4db..5731c63ddf971066886a28a797c544e4546ae1d6
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,11 -1,11 +1,15 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2018, PHP 7.1.25
 +?? ??? 2018, PHP 7.2.13
 +
 +- Fileinfo:
 +  . Fixed bug #77095 (slowness regression in 7.2/7.3 (compared to 7.1)).
 +    (Anatol)
  
+ - iconv:
+   . Fixed bug #77147 (Fixing 60494 ignored ICONV_MIME_DECODE_CONTINUE_ON_ERROR).
+     (cmb)
+ 
  - ODBC:
    . Fixed bug #77079 (odbc_fetch_object has incorrect type signature).
      (Jon Allen)

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