Upgraded to PHP 5.4