Merge branch 'PHP-5.6' of https://github.com/php/php-src into PHP-5.6

diff --cc Zend/zend_vm_opcodes.c
index 22fc7cbcf3d32ee1ba6c1431c6533b4fc34ab94b,04af26cdb466c6f14305396dee33ae665745cf46..177c3fd02ea86655fafe4baeaf13ad60f5db0693
--- 1/Zend/zend_vm_opcodes.c
--- 2/Zend/zend_vm_opcodes.c
+++ b/Zend/zend_vm_opcodes.c
@@@ -19,9 -19,8 +19,9 @@@
  */
  
  #include <stdio.h>
 +#include <zend.h>
  
- const char *zend_vm_opcodes_map[164] = {
+ const char *zend_vm_opcodes_map[165] = {
        "ZEND_NOP",
        "ZEND_ADD",
        "ZEND_SUB",
@@@ -186,8 -185,5 +186,9 @@@
        "ZEND_GENERATOR_RETURN",
        "ZEND_FAST_CALL",
        "ZEND_FAST_RET",
+       "ZEND_RECV_VARIADIC",
  };
 +
 +ZEND_API const char* zend_get_opcode_name(zend_uchar opcode) {
 +      return zend_vm_opcodes_map[opcode];
 +}