Merge branch 'integration' into release

Conflicts:
	ChangeLog
	NEWS
Add missing hyphens in configuration script.