Merge branch 'master' into iterable

diff --cc Zend/zend_API.c
Simple merge

diff --cc Zend/zend_API.h
Simple merge

diff --cc Zend/zend_compile.c
Simple merge

diff --cc Zend/zend_execute.c
Simple merge

diff --cc Zend/zend_vm_def.h
Simple merge

diff --cc Zend/zend_vm_execute.h
Simple merge

diff --cc ext/opcache/Optimizer/zend_inference.c
Simple merge

diff --cc ext/standard/basic_functions.c
Simple merge

diff --cc ext/standard/type.c
Simple merge