Fixed test
Merge remote branch 'origin/PHP-5.6'