Merge branch 'PHP-7.1' into PHP-7.2

diff --cc NEWS
index f26f43862ea654875da8fc08f43d4aea1f10905f,07fd8ef1b0caf7a87bd510784467f3fbf9af2b9e..32a0d073aa851af748f5a84f695ed557f3af2ec5
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,14 -1,12 +1,16 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.1.11
 +?? ??? ????, PHP 7.2.0RC3
  
 -- Core:
 +- Core
 +  . Fixed bug #74878 (Data race in ZTS builds). (Nikita, Dmitry)
    . Fixed bug #75236 (infinite loop when printing an error-message). (Andrea)
+   . Fixed bug #75252 (Incorrect token formatting on two parse errors in one
+     request). (Nikita)
  
 +- FPM:
 +  . Fixed bug #75212 (php_value acts like php_admin_value). (Remi)
 +
  - MySQLi:
    . Fixed bug #75018 (Data corruption when reading fields of bit type). (Anatol)
  

diff --cc Zend/zend.c
Simple merge

diff --cc main/main.c
Simple merge