Merge branch 'PHP-7.1' into PHP-7.2

author Anatol Belski <ab@php.net>

Tue, 31 Oct 2017 09:38:18 +0000 (10:38 +0100)

committer Anatol Belski <ab@php.net>

Tue, 31 Oct 2017 09:38:18 +0000 (10:38 +0100)
author Anatol Belski <ab@php.net>
Tue, 31 Oct 2017 09:38:18 +0000 (10:38 +0100)
committer Anatol Belski <ab@php.net>
Tue, 31 Oct 2017 09:38:18 +0000 (10:38 +0100)
diff --cc win32/build/Makefile
Simple merge
diff --cc win32/build/confutils.js
Simple merge
author	Anatol Belski <ab@php.net>
	Tue, 31 Oct 2017 09:38:18 +0000 (10:38 +0100)
committer	Anatol Belski <ab@php.net>
	Tue, 31 Oct 2017 09:38:18 +0000 (10:38 +0100)
		1	2
win32/build/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
win32/build/confutils.js	patch \|	diff1 \|	diff2 \|	blob \| history