Merge branch 'PHP-7.1' into PHP-7.2

author Nikita Popov <nikita.ppv@gmail.com>

Tue, 28 Nov 2017 22:34:00 +0000 (23:34 +0100)

committer Nikita Popov <nikita.ppv@gmail.com>

Tue, 28 Nov 2017 22:34:25 +0000 (23:34 +0100)
author Nikita Popov <nikita.ppv@gmail.com>
Tue, 28 Nov 2017 22:34:00 +0000 (23:34 +0100)
committer Nikita Popov <nikita.ppv@gmail.com>
Tue, 28 Nov 2017 22:34:25 +0000 (23:34 +0100)
diff --cc NEWS
Simple merge
diff --cc ext/standard/info.c
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Tue, 28 Nov 2017 22:34:00 +0000 (23:34 +0100)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Tue, 28 Nov 2017 22:34:25 +0000 (23:34 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/standard/info.c	patch \|	diff1 \|	diff2 \|	blob \| history