Fix bug #68188
Merge branch 'PHP-5.5' into PHP-5.6