PHP-5.6.5 is next
Merge branch 'PHP-5.6'

* PHP-5.6:
  PHP-5.6.5 is next

Conflicts:
	configure.in
	main/php_version.h