PHP 5.4 update from dmi3yy