event time fixes
Merge branch 'master' into version_1_9