Vendordrop of iscan-2.29.3
Merge branch 'iscan-2.29.3-1'

Conflicts:
	backend/channel-usb.c