Merge branch 'PHP-7.1' into PHP-7.2

author Anatol Belski <ab@php.net>

Mon, 30 Oct 2017 10:16:33 +0000 (11:16 +0100)

committer Anatol Belski <ab@php.net>

Mon, 30 Oct 2017 10:16:33 +0000 (11:16 +0100)
author Anatol Belski <ab@php.net>
Mon, 30 Oct 2017 10:16:33 +0000 (11:16 +0100)
committer Anatol Belski <ab@php.net>
Mon, 30 Oct 2017 10:16:33 +0000 (11:16 +0100)
diff --cc .appveyor.yml
Simple merge
diff --cc appveyor/build.bat
Simple merge
author	Anatol Belski <ab@php.net>
	Mon, 30 Oct 2017 10:16:33 +0000 (11:16 +0100)
committer	Anatol Belski <ab@php.net>
	Mon, 30 Oct 2017 10:16:33 +0000 (11:16 +0100)
		1	2
.appveyor.yml	patch \|	diff1 \|	diff2 \|	blob \| history
appveyor/build.bat	patch \|	diff1 \|	diff2 \|	blob \| history