Merge 3.5-rc5 into usb-next