Set session id to have the same timestamp as the session_start event
Merge branch 'master' into corona