bugzid 3954: fixed device ids
Merge pull request #36 from daniellemayne/2013.07

2013.07 - bugzid 3954: fixed device ids