Add new constants
Merge branch 'PHP-5.5'
Merge branch 'master' of ssh://git.php.net/php-src