Merge branch 'PHP-5.5' into PHP-5.6

diff --cc Zend/zend_vm_gen.php
Simple merge

diff --cc Zend/zend_vm_opcodes.h
index 663e216183001942dc276c25ab2154b0665cf2de,18bb0d27f71a01d9ee0105977b4f69f345a3c8f1..672f223bdd2cb6e7424093438f8794bb34c30ff8
--- 1/Zend/zend_vm_opcodes.h
--- 2/Zend/zend_vm_opcodes.h
+++ b/Zend/zend_vm_opcodes.h
@@@ -167,9 -167,8 +167,9 @@@
  #define ZEND_GENERATOR_RETURN                161
  #define ZEND_FAST_CALL                       162
  #define ZEND_FAST_RET                        163
 +#define ZEND_RECV_VARIADIC                   164
  
- const char *zend_vm_opcodes_map[] = {
+ static const char *zend_vm_opcodes_map[] = {
        "ZEND_NOP",
        "ZEND_ADD",
        "ZEND_SUB",