add new features
Merge branch 'PHP-5.5'

* PHP-5.5:
  add new features

Conflicts:
	UPGRADING