- ws
Merge branch 'PHP-5.5'

* PHP-5.5:
  - ws

Conflicts:
	UPGRADING