Merge branch 'PHP-7.1' into PHP-7.2

author Remi Collet <remi@php.net>

Sat, 8 Dec 2018 09:25:05 +0000 (10:25 +0100)

committer Remi Collet <remi@php.net>

Sat, 8 Dec 2018 09:25:05 +0000 (10:25 +0100)
author Remi Collet <remi@php.net>
Sat, 8 Dec 2018 09:25:05 +0000 (10:25 +0100)
committer Remi Collet <remi@php.net>
Sat, 8 Dec 2018 09:25:05 +0000 (10:25 +0100)
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	Remi Collet <remi@php.net>
	Sat, 8 Dec 2018 09:25:05 +0000 (10:25 +0100)
committer	Remi Collet <remi@php.net>
	Sat, 8 Dec 2018 09:25:05 +0000 (10:25 +0100)
		1	2
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history