Merge branch 'PHP-7.1' into PHP-7.2

author Christoph M. Becker <cmbecker69@gmx.de>

Sat, 24 Feb 2018 10:31:22 +0000 (11:31 +0100)

committer Christoph M. Becker <cmbecker69@gmx.de>

Sat, 24 Feb 2018 10:32:03 +0000 (11:32 +0100)
author Christoph M. Becker <cmbecker69@gmx.de>
Sat, 24 Feb 2018 10:31:22 +0000 (11:31 +0100)
committer Christoph M. Becker <cmbecker69@gmx.de>
Sat, 24 Feb 2018 10:32:03 +0000 (11:32 +0100)
diff --cc NEWS
Simple merge
diff --cc ext/gd/gd.c
Simple merge
author	Christoph M. Becker <cmbecker69@gmx.de>
	Sat, 24 Feb 2018 10:31:22 +0000 (11:31 +0100)
committer	Christoph M. Becker <cmbecker69@gmx.de>
	Sat, 24 Feb 2018 10:32:03 +0000 (11:32 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/gd/gd.c	patch \|	diff1 \|	diff2 \|	blob \| history