Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180427-pull-request' into...