Fixed bug #66176 (Invalid constant substitution)
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #66176 (Invalid constant substitution)

Conflicts:
	NEWS
Revert NEWS
Merge branch 'PHP-5.6'

* PHP-5.6:
  Revert NEWS
  Fixed bug #66176 (Invalid constant substitution)
Fixed bug #66176 (Invalid constant substitution)
Fixed a wrong test
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed a wrong test
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed a wrong test
Fixed bug #66176 (Invalid constant substitution)
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed bug #66176 (Invalid constant substitution)
  Fixed bug #66176 (Invalid constant substitution)
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed bug #66176 (Invalid constant substitution)
  Fixed bug #66176 (Invalid constant substitution)
Added an optimization of class constants and constant calls to some internal functions
Added an optimization of class constants and constant calls to some internal functions
Merge branch 'PHP-5.6'

* PHP-5.6:
  Added an optimization of class constants and constant calls to some internal functions
  Added an optimization of class constants and constant calls to some internal functions

Conflicts:
	NEWS
Merge branch 'master' of git.php.net:php-src

* 'master' of git.php.net:php-src:
  Fixed a wrong test
Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6

* 'PHP-5.6' of git.php.net:php-src:
  Fixed a wrong test
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  Fixed a wrong test
Fixed opcahce_reset() crash when opcache.protect_memory is set
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fixed opcahce_reset() crash when opcache.protect_memory is set
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fixed opcahce_reset() crash when opcache.protect_memory is set