Merge branch 'PHP-7.1' into PHP-7.2

author Joe Watkins <krakjoe@php.net>

Mon, 23 Oct 2017 08:11:52 +0000 (09:11 +0100)

committer Joe Watkins <krakjoe@php.net>

Mon, 23 Oct 2017 08:12:06 +0000 (09:12 +0100)
author Joe Watkins <krakjoe@php.net>
Mon, 23 Oct 2017 08:11:52 +0000 (09:11 +0100)
committer Joe Watkins <krakjoe@php.net>
Mon, 23 Oct 2017 08:12:06 +0000 (09:12 +0100)
diff --cc NEWS
Simple merge
diff --cc php.ini-development
Simple merge
diff --cc php.ini-production
Simple merge
author	Joe Watkins <krakjoe@php.net>
	Mon, 23 Oct 2017 08:11:52 +0000 (09:11 +0100)
committer	Joe Watkins <krakjoe@php.net>
	Mon, 23 Oct 2017 08:12:06 +0000 (09:12 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-development	patch \|	diff1 \|	diff2 \|	blob \| history
php.ini-production	patch \|	diff1 \|	diff2 \|	blob \| history