Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix #74139: mail.add_x_header default inconsistent with docs [ci skip]

diff --cc NEWS
index 85bdec447b07e3d963822163e8a230b6bd40dbe8,fc7b5a65515480b506d222c64d112f8968ecd3e2..46db91b9908a651cf641df97071ead6de1d29fe9
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,13 -1,6 +1,15 @@@
  PHP                                                                        NEWS
  |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 -?? ??? ????, PHP 7.1.16
 +?? ??? 2018, PHP 7.2.5
 +
 +- ODBC:
 +  . Fixed bug #76088 (ODBC functions are not available by default on Windows).
 +    (cmb)
 +
++- Standard:
++  . Fixed bug #74139 (mail.add_x_header default inconsistent with docs). (cmb)
 +
 +29 Mar 2018, PHP 7.2.4
  
  - Core:
    . Fixed bug #76025 (Segfault while throwing exception in error_handler).

diff --cc php.ini-development
Simple merge

diff --cc php.ini-production
Simple merge