Try harder to find devices
Merge pull request #1119 from bootstraponline/protocol_fault

Try harder to find devices