Merge branch 'PHP-7.1' into PHP-7.2

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

Sat, 25 Aug 2018 12:51:47 +0000 (14:51 +0200)

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

Sat, 25 Aug 2018 12:52:54 +0000 (14:52 +0200)
author Christoph M. Becker <cmbecker69@gmx.de>
Sat, 25 Aug 2018 12:51:47 +0000 (14:51 +0200)
committer Christoph M. Becker <cmbecker69@gmx.de>
Sat, 25 Aug 2018 12:52:54 +0000 (14:52 +0200)
diff --cc NEWS
Simple merge
diff --cc ext/iconv/iconv.c
Simple merge
author	Christoph M. Becker <cmbecker69@gmx.de>
	Sat, 25 Aug 2018 12:51:47 +0000 (14:51 +0200)
committer	Christoph M. Becker <cmbecker69@gmx.de>
	Sat, 25 Aug 2018 12:52:54 +0000 (14:52 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/iconv/iconv.c	patch \|	diff1 \|	diff2 \|	blob \| history