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

Conflicts:
	ext/spl/spl_array.c