Merge branch 'maint'

Conflicts:

	README
	version.h