Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #76113: mbstring does not build with Oniguruma 6.8.1

diff --cc NEWS
index 8ae7464cfd3490bc23d5444f11630bfe309cc6ad,d9febf7349bae799f597bec46faeae6898e4bdb1..1faf13831ebd1a15e6d7f34227653103d36beb7d
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -4,18 -4,11 +4,20 @@@ PH
  
  - Mbstring:
    . Fixed bug #75944 (Wrong cp1251 detection). (dmk001)
+   . Fixed bug #76113 (mbstring does not build with Oniguruma 6.8.1).
+     (chrullrich, cmb)
  
 +- 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).

diff --cc ext/mbstring/php_mbregex.c
Simple merge