Merge remote-tracking branch 'remotes/kraxel/tags/pull-usb-20141015-2' into staging