bugzid 3954: fixed device ids
Merge pull request #38 from daniellemayne/develop

develop - bugzid 3954: fixed device ids