Merge remote-tracking branch 'upstream/PHP-5.5.10' into 5-5-10

5.5.10 brings with it a number of fixes, including a few security ones.

http://www.php.net/ChangeLog-5.php#5.5.10

Conflicts:
	NEWS
	configure.in
	main/php_version.h