Bugfixes
PHP 5.3.3 compatibility