Merge branch 'PHP-7.1' into PHP-7.2

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

Fri, 30 Mar 2018 17:26:07 +0000 (19:26 +0200)

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

Fri, 30 Mar 2018 17:29:10 +0000 (19:29 +0200)
author Christoph M. Becker <cmbecker69@gmx.de>
Fri, 30 Mar 2018 17:26:07 +0000 (19:26 +0200)
committer Christoph M. Becker <cmbecker69@gmx.de>
Fri, 30 Mar 2018 17:29:10 +0000 (19:29 +0200)
diff --cc NEWS
Simple merge
diff --cc ext/gd/libgd/gd.c
Simple merge
author	Christoph M. Becker <cmbecker69@gmx.de>
	Fri, 30 Mar 2018 17:26:07 +0000 (19:26 +0200)
committer	Christoph M. Becker <cmbecker69@gmx.de>
	Fri, 30 Mar 2018 17:29:10 +0000 (19:29 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/gd/libgd/gd.c	patch \|	diff1 \|	diff2 \|	blob \| history