Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20151020-1' into staging