Merge pull request #1200 from anandpdoshi/hotfix-scheduler-errors

[patch] Email Digest