Merge v3.6-rc3 into usb-next