Merge remote-tracking branch 'kraxel/usb.49' into staging