Prevent recursion in ZF2 Parameters class
Merge branch 'PHP-5.6'

Conflicts:
	ext/spl/spl_array.c
gcov: tentative fix for broken coverage data after fix for opcache coverage
slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
gcov: tentative fix for broken coverage data after fix for opcache coverage
slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir
Optimize ZEND_POW (Rouven Weßling)
Merge branch 'PHP-5.6'

* PHP-5.6:
  Optimize ZEND_POW (Rouven Weßling)
  gcov: tentative fix for broken coverage data after fix for opcache coverage slightly hackish, but works. The idea is that we want to give priority to .gcda files in .libs dirs vs the files in the upper level dir

Conflicts:
	ext/opcache/ZendAccelerator.h
Support for __debugInfo (Joe Watkins)
Merge branch 'PHP-5.6'

* PHP-5.6:
  Support for __debugInfo (Joe Watkins)
Merge branch 'master' of git://github.com/php/php-src