Merge pull request #4113 from rmehta/email-digest-cleanup

[cleanup] Email Digest