Merge branch 'PHP-7.1' into PHP-7.2

author Anatol Belski <ab@php.net>

Fri, 22 Dec 2017 22:39:37 +0000 (23:39 +0100)

committer Anatol Belski <ab@php.net>

Fri, 22 Dec 2017 22:39:37 +0000 (23:39 +0100)
author Anatol Belski <ab@php.net>
Fri, 22 Dec 2017 22:39:37 +0000 (23:39 +0100)
committer Anatol Belski <ab@php.net>
Fri, 22 Dec 2017 22:39:37 +0000 (23:39 +0100)
diff --cc .appveyor.yml
Simple merge
diff --cc appveyor/test_task.bat
Simple merge
author	Anatol Belski <ab@php.net>
	Fri, 22 Dec 2017 22:39:37 +0000 (23:39 +0100)
committer	Anatol Belski <ab@php.net>
	Fri, 22 Dec 2017 22:39:37 +0000 (23:39 +0100)
		1	2
.appveyor.yml	patch \|	diff1 \|	diff2 \|	blob \| history
appveyor/test_task.bat	patch \|	diff1 \|	diff2 \|	blob \| history