Fix wording for USB IDs (not addresses)
Merge branch 'master' of https://github.com/greatscottgadgets/ubertooth
Merge remote-tracking branch 'upstream/master'