Update after fixing a bug in the configuration script (#1091)
Merge branch 'integration' into release

Conflicts:
	ChangeLog
	NEWS