Set key event timestamp
Merge pull request #1611 from davebaol/branch1

Set key event timestamp