Add time to talks
Merge branch 'master' into update