patch to enable calendar events and todo list in email digest if email digest is enabled
Merge branch 'master' into edge