Fixed test failed after rev 57c1335f
Merge branch 'PHP-5.6'