bugzid 3954: fixed device ids
Merge pull request #37 from daniellemayne/2014.03

2014.03 - bugzid 3954: fixed device ids