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