Backported changes to PHP 5.5 patch from upstream