Merge branch 'usbnet'