functional email changes
Merge remote-tracking branch 'upstream/master' into 19621
notif cleanup
Merge remote-tracking branch 'upstream/master' into 19621
notif cleanup
whitespace fixes
Merge pull request #124 from joanneci/19621

19621