Merge branch 'PHP-7.0' into PHP-7.1

author Nikita Popov <nikic@php.net>

Tue, 10 Jan 2017 22:29:16 +0000 (23:29 +0100)

committer Nikita Popov <nikic@php.net>

Tue, 10 Jan 2017 22:29:43 +0000 (23:29 +0100)
author Nikita Popov <nikic@php.net>
Tue, 10 Jan 2017 22:29:16 +0000 (23:29 +0100)
committer Nikita Popov <nikic@php.net>
Tue, 10 Jan 2017 22:29:43 +0000 (23:29 +0100)
diff --cc NEWS
Simple merge
diff --cc ext/dom/node.c
Simple merge
author	Nikita Popov <nikic@php.net>
	Tue, 10 Jan 2017 22:29:16 +0000 (23:29 +0100)
committer	Nikita Popov <nikic@php.net>
	Tue, 10 Jan 2017 22:29:43 +0000 (23:29 +0100)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/dom/node.c	patch \|	diff1 \|	diff2 \|	blob \| history