Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
	ext/spl/spl_iterators.c

diff --cc ext/spl/spl_iterators.c
index 6a0049733fa6687e2d9190caee0eea28bd657bad,a023b11829e12938cc10efb86096f3b3c94eba63..0977228faa1b9751d963ec324a5d4253b5fa4260
--- 1/ext/spl/spl_iterators.c
--- 2/ext/spl/spl_iterators.c
+++ b/ext/spl/spl_iterators.c
@@@ -1675,12 -1684,12 +1675,12 @@@ static inline void spl_dual_it_free(spl
        }
  }
  
 -static inline void spl_dual_it_rewind(spl_dual_it_object *intern TSRMLS_DC)
 +static inline void spl_dual_it_rewind(spl_dual_it_object *intern)
  {
 -      spl_dual_it_free(intern TSRMLS_CC);
 +      spl_dual_it_free(intern);
        intern->current.pos = 0;
-       if (intern->inner.iterator->funcs->rewind) {
+       if (intern->inner.iterator && intern->inner.iterator->funcs->rewind) {
 -              intern->inner.iterator->funcs->rewind(intern->inner.iterator TSRMLS_CC);
 +              intern->inner.iterator->funcs->rewind(intern->inner.iterator);
        }
  }