Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	Zend/zend_vm_gen.php
	Zend/zend_vm_opcodes.h

diff --cc Zend/zend_vm_gen.php
Simple merge

diff --cc Zend/zend_vm_opcodes.h
index 2ca7f84c5cd1475329642253289583018cb72ae9,51b513a56deeeda52c2b4eb2b19ec270cfa155fe..18bb0d27f71a01d9ee0105977b4f69f345a3c8f1
--- 1/Zend/zend_vm_opcodes.h
--- 2/Zend/zend_vm_opcodes.h
+++ b/Zend/zend_vm_opcodes.h
@@@ -162,13 -162,8 +162,13 @@@
  #define ZEND_SEPARATE                        156
  #define ZEND_QM_ASSIGN_VAR                   157
  #define ZEND_JMP_SET_VAR                     158
 +#define ZEND_DISCARD_EXCEPTION               159
 +#define ZEND_YIELD                           160
 +#define ZEND_GENERATOR_RETURN                161
 +#define ZEND_FAST_CALL                       162
 +#define ZEND_FAST_RET                        163
  
- const char *zend_vm_opcodes_map[] = {
+ static const char *zend_vm_opcodes_map[] = {
        "ZEND_NOP",
        "ZEND_ADD",
        "ZEND_SUB",