Merge branch 'master' into event-tz
Merge pull request #919 from fangeugene/event-tz

Store event timezone id
Merge branch 'master' into match-times