Php 5.5

I think 5dfaf84 and ae1a372 have been lost in the github limbo

c85563b new for 5.5.0beta3

2b72e13 new for 5.4.15, see 
http://git.php.net/?p=php-src.git;a=commitdiff;h=e34767d4266b0f9e0444e775a82467dc1926a9a2

Please cherry-pick the latest in master tree (perhaps after 5.4.14 release)