Merge branch 'PHP-5.6'

diff --cc Zend/zend_API.c
Simple merge

diff --cc Zend/zend_ast.c
Simple merge

diff --cc Zend/zend_execute.h
Simple merge

diff --cc Zend/zend_execute_API.c
Simple merge

diff --cc Zend/zend_object_handlers.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/zend_accelerator_module.c
Simple merge

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

diff --cc sapi/apache2handler/sapi_apache2.c
Simple merge

diff --cc sapi/cgi/cgi_main.c
Simple merge