Add client time to events
Merge pull request #1955 from lavalamp/fix3

Add client time to events