Merge branch 'PHP-7.1'

author Nikita Popov <nikic@php.net>

Fri, 9 Sep 2016 13:31:54 +0000 (15:31 +0200)

committer Nikita Popov <nikic@php.net>

Fri, 9 Sep 2016 13:31:54 +0000 (15:31 +0200)
author Nikita Popov <nikic@php.net>
Fri, 9 Sep 2016 13:31:54 +0000 (15:31 +0200)
committer Nikita Popov <nikic@php.net>
Fri, 9 Sep 2016 13:31:54 +0000 (15:31 +0200)
diff --cc Zend/zend_vm_def.h
Simple merge
diff --cc Zend/zend_vm_execute.h
Simple merge
author	Nikita Popov <nikic@php.net>
	Fri, 9 Sep 2016 13:31:54 +0000 (15:31 +0200)
committer	Nikita Popov <nikic@php.net>
	Fri, 9 Sep 2016 13:31:54 +0000 (15:31 +0200)
		1	2
Zend/zend_vm_def.h	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_vm_execute.h	patch \|	diff1 \|	diff2 \|	blob \| history