Fixed bug #64070 (Inheritance with Traits failed with error)
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed bug #64070 (Inheritance with Traits failed with error)

Conflicts:
	NEWS
	Zend/zend_compile.c
Merge branch 'PHP-5.5'

* PHP-5.5:
  Fixed bug #64070 (Inheritance with Traits failed with error)
Merge remote-tracking branch 'upstream/master'