Merge branch 'maint'

Conflicts:

	README
	resize/online.c
	version.h