Updated against PHP 5.5.12