Merge branch 'PHP-7.0' into PHP-7.1

author Nikita Popov <nikic@php.net>

Wed, 12 Oct 2016 21:15:36 +0000 (23:15 +0200)

committer Nikita Popov <nikic@php.net>

Wed, 12 Oct 2016 21:15:48 +0000 (23:15 +0200)
author Nikita Popov <nikic@php.net>
Wed, 12 Oct 2016 21:15:36 +0000 (23:15 +0200)
committer Nikita Popov <nikic@php.net>
Wed, 12 Oct 2016 21:15:48 +0000 (23:15 +0200)
diff --cc NEWS
Simple merge
diff --cc ext/soap/php_encoding.c
Simple merge
author	Nikita Popov <nikic@php.net>
	Wed, 12 Oct 2016 21:15:36 +0000 (23:15 +0200)
committer	Nikita Popov <nikic@php.net>
	Wed, 12 Oct 2016 21:15:48 +0000 (23:15 +0200)
		1	2
NEWS	patch \|	diff1 \|	diff2 \|	blob \| history
ext/soap/php_encoding.c	patch \|	diff1 \|	diff2 \|	blob \| history