Merge branch 'PHP-5.5'

Conflicts:
	UPGRADING
	UPGRADING.INTERNALS

diff --cc Zend/zend.h
Simple merge

diff --cc Zend/zend_vm_def.h
Simple merge

diff --cc Zend/zend_vm_execute.h
Simple merge