missed part of the patch
Merge branch 'PHP-5.5'