Merge 3.1-rc1 into usb-linus