Update to resolve PHP 5.4 incompatibilities.