Merge branch 'PHP-7.1' into PHP-7.2

author Anatol Belski <ab@php.net>

Mon, 28 May 2018 15:13:55 +0000 (17:13 +0200)

committer Anatol Belski <ab@php.net>

Mon, 28 May 2018 15:13:55 +0000 (17:13 +0200)
author Anatol Belski <ab@php.net>
Mon, 28 May 2018 15:13:55 +0000 (17:13 +0200)
committer Anatol Belski <ab@php.net>
Mon, 28 May 2018 15:13:55 +0000 (17:13 +0200)
diff --cc ext/standard/array.c
Simple merge
diff --cc win32/build/confutils.js
Simple merge
author	Anatol Belski <ab@php.net>
	Mon, 28 May 2018 15:13:55 +0000 (17:13 +0200)
committer	Anatol Belski <ab@php.net>
	Mon, 28 May 2018 15:13:55 +0000 (17:13 +0200)
		1	2
ext/standard/array.c	patch \|	diff1 \|	diff2 \|	blob \| history
win32/build/confutils.js	patch \|	diff1 \|	diff2 \|	blob \| history