bring the news
Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
	NEWS