build fixes
Merge branch 'PHP-5.5'

Conflicts:
	NEWS
Merge branch 'master' of ssh://git.php.net/php-src