Changes DeviceTriggerData to take an ID instead of an entire class.
Merge remote-tracking branch 'origin/master'