Merge branch 'PHP-7.0' into PHP-7.1

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

Sat, 28 Oct 2017 10:57:36 +0000 (12:57 +0200)

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

Sat, 28 Oct 2017 10:57:46 +0000 (12:57 +0200)
author Nikita Popov <nikita.ppv@gmail.com>
Sat, 28 Oct 2017 10:57:36 +0000 (12:57 +0200)
committer Nikita Popov <nikita.ppv@gmail.com>
Sat, 28 Oct 2017 10:57:46 +0000 (12:57 +0200)
diff --cc NEWS
Simple merge
diff --cc ext/mysqli/mysqli_fe.c
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Sat, 28 Oct 2017 10:57:36 +0000 (12:57 +0200)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Sat, 28 Oct 2017 10:57:46 +0000 (12:57 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/mysqli/mysqli_fe.c	patch \|	diff1 \|	diff2 \|	blob \| history