Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #75944: Wrong cp1251 detection

diff --cc NEWS
index 4882f007b45516e9406fcb548f781fc61753fcb6,921d9123d1ca113c2e6981a880a56120219e6971..8ae7464cfd3490bc23d5444f11630bfe309cc6ad
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,18 -1,12 +1,21 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.1.17
 +?? ??? 2018, PHP 7.2.5
  
+ - Mbstring:
+   . Fixed bug #75944 (Wrong cp1251 detection). (dmk001)
+ 
 +- ODBC:
 +  . Fixed bug #76088 (ODBC functions are not available by default on Windows).
 +    (cmb)
 +
 +- Opcache:
 +  . Fixed bug #76094 (Access violation when using opcache). (Laruence)
 +
 +- Standard:
 +  . Fixed bug #74139 (mail.add_x_header default inconsistent with docs). (cmb)
  
 -29 Mar 2018, PHP 7.1.16
 +29 Mar 2018, PHP 7.2.4
  
  - Core:
    . Fixed bug #76025 (Segfault while throwing exception in error_handler).