Merge 3.7-rc5 into usb-next

This pulls in the 3.7-rc5 branch into usb-next