Merge branch 3.13-rc4 into usb-next