add new functions and constants for GD
conflict
Merge branch 'master' of git.php.net:php-src