Merge branch 'maint' into next

Conflicts:
	configure
	configure.in