Merge branch 'PHP-7.0' into PHP-7.1

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

Fri, 3 Feb 2017 17:42:19 +0000 (18:42 +0100)

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

Fri, 3 Feb 2017 17:42:28 +0000 (18:42 +0100)
author Nikita Popov <nikita.ppv@gmail.com>
Fri, 3 Feb 2017 17:42:19 +0000 (18:42 +0100)
committer Nikita Popov <nikita.ppv@gmail.com>
Fri, 3 Feb 2017 17:42:28 +0000 (18:42 +0100)
diff --cc NEWS
Simple merge
diff --cc ext/dom/document.c
Simple merge
author	Nikita Popov <nikita.ppv@gmail.com>
	Fri, 3 Feb 2017 17:42:19 +0000 (18:42 +0100)
committer	Nikita Popov <nikita.ppv@gmail.com>
	Fri, 3 Feb 2017 17:42:28 +0000 (18:42 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/dom/document.c	patch \|	diff1 \|	diff2 \|	blob \| history