Merge branch 'PHP-7.2' into PHP-7.3

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

diff --cc NEWS
index dd324d7bd22b03561c81a899fd5e86f31bea4dbf,5731c63ddf971066886a28a797c544e4546ae1d6..a35d2a6b4d5cfc67207c3a2ed42cd8baeceb690f
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,21 -1,15 +1,25 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? 2018, PHP 7.2.13
 -
 -- Fileinfo:
 -  . Fixed bug #77095 (slowness regression in 7.2/7.3 (compared to 7.1)).
 -    (Anatol)
 +?? ??? ????, PHP 7.3.0RC6
  
+ - iconv:
+   . Fixed bug #77147 (Fixing 60494 ignored ICONV_MIME_DECODE_CONTINUE_ON_ERROR).
+     (cmb)
+ 
 +- SOAP:
 +  . Fixed bug #77141 (Signedness issue in SOAP when precision=-1). (cmb)
 +
 +08 Nov 2018 PHP 7.3.0RC5
 +
 +- Core:
 +  . Fixed bug #76825 (Undefined symbols ___cpuid_count). (Laruence, cmb)
 +  . Fixed bug #77110 (undefined symbol zend_string_equal_val in C++ build).
 +    (Remi)
 +
 +- Fileinfo:
 +  . Fixed bug #77095 (slowness regression in 7.2/7.3 (compared to 7.1)).
 +    (Anatol)
 +
  - ODBC:
    . Fixed bug #77079 (odbc_fetch_object has incorrect type signature).
      (Jon Allen)

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