Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	Zend/zend_execute_API.c

diff --cc Zend/zend_execute_API.c
index c9de6b93caa5446655e04887a50e022572da89c2,e100484f6f4fde78bbd48b26d668bfedbe641848..af32e91f280b23effd35e328c3f1c2cd0cfe24cb
--- 1/Zend/zend_execute_API.c
--- 2/Zend/zend_execute_API.c
+++ b/Zend/zend_execute_API.c
@@@ -449,9 -448,7 +449,7 @@@ ZEND_API int zend_is_true(zval *op) /* 
  }
  /* }}} */
  
- #include "../TSRM/tsrm_strtok_r.h"
- 
 -#define IS_VISITED_CONSTANT                   IS_CONSTANT_INDEX
 +#define IS_VISITED_CONSTANT                   0x80
  #define IS_CONSTANT_VISITED(p)                (Z_TYPE_P(p) & IS_VISITED_CONSTANT)
  #define Z_REAL_TYPE_P(p)                      (Z_TYPE_P(p) & ~IS_VISITED_CONSTANT)
  #define MARK_CONSTANT_VISITED(p)      Z_TYPE_P(p) |= IS_VISITED_CONSTANT