Merge 4.7-rc4 into usb-next