fix bug #60833 - self, parent, static behave inconsistently case-sensitive
Merge branch 'PHP-5.5'

* PHP-5.5:
  fix bug #60833 - self, parent, static behave inconsistently case-sensitive

Conflicts:
	UPGRADING