Merge pull request #792 from anandpdoshi/anand-auaugst-25

Website fixes
[fix] Handle clear notifications deadlock