Merge branch 'PHP-7.1' into PHP-7.2

author Sara Golemon <pollita@php.net>

Thu, 27 Jul 2017 14:04:59 +0000 (10:04 -0400)

committer Sara Golemon <pollita@php.net>

Thu, 27 Jul 2017 14:04:59 +0000 (10:04 -0400)
author Sara Golemon <pollita@php.net>
Thu, 27 Jul 2017 14:04:59 +0000 (10:04 -0400)
committer Sara Golemon <pollita@php.net>
Thu, 27 Jul 2017 14:04:59 +0000 (10:04 -0400)
diff --cc Zend/zend_operators.c
Simple merge
diff --cc Zend/zend_portability.h
Simple merge
author	Sara Golemon <pollita@php.net>
	Thu, 27 Jul 2017 14:04:59 +0000 (10:04 -0400)
committer	Sara Golemon <pollita@php.net>
	Thu, 27 Jul 2017 14:04:59 +0000 (10:04 -0400)
		1	2
Zend/zend_operators.c	patch \|	diff1 \|	diff2 \|	blob \| history
Zend/zend_portability.h	patch \|	diff1 \|	diff2 \|	blob \| history