Merge 3.1-rc4 into usb-next