Updating to latest upstream S3.php.