Merge 4.1-rc7 into usb-next