Merge branch 'PHP-5.5' into PHP-5.6

diff --cc Zend/zend_compile.h
Simple merge

diff --cc Zend/zend_opcode.c
Simple merge

diff --cc Zend/zend_vm_def.h
Simple merge

diff --cc Zend/zend_vm_execute.h
Simple merge