Fixed bug #63976 (Parent class incorrectly using child constant in class property)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #63976 (Parent class incorrectly using child constant in class property)

Conflicts:
	NEWS
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #63976 (Parent class incorrectly using child constant in class property)