5.4.16-dev
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  5.4.16-dev

Conflicts:
	configure.in
	main/php_version.h
Merge branch 'PHP-5.5'

* PHP-5.5:
  5.4.16-dev