user.login and device.guid are now
Merge remote-tracking branch 'origin/master'