sync
Merge remote-tracking branch 'origin/master' into all2

Conflicts:
	dev/usb/usbdevs.h
	dev/usb/usbdevs_data.h