DeviceID switched to string - fixes.
Merge remote-tracking branch 'remotes/devicehive/master'