Fix compiler warning on redefined constant
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'