Merge branch 'PHP-7.1' into PHP-7.2

author Joe Watkins <krakjoe@php.net>

Tue, 12 Sep 2017 06:06:46 +0000 (07:06 +0100)

committer Joe Watkins <krakjoe@php.net>

Tue, 12 Sep 2017 06:08:01 +0000 (07:08 +0100)
author Joe Watkins <krakjoe@php.net>
Tue, 12 Sep 2017 06:06:46 +0000 (07:06 +0100)
committer Joe Watkins <krakjoe@php.net>
Tue, 12 Sep 2017 06:08:01 +0000 (07:08 +0100)
diff --cc NEWS
Simple merge
diff --cc ext/spl/spl_iterators.c
Simple merge
author	Joe Watkins <krakjoe@php.net>
	Tue, 12 Sep 2017 06:06:46 +0000 (07:06 +0100)
committer	Joe Watkins <krakjoe@php.net>
	Tue, 12 Sep 2017 06:08:01 +0000 (07:08 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/spl/spl_iterators.c	patch \|	diff1 \|	diff2 \|	blob \| history