Merge branch 'maint'

Conflicts:

	configure