Fix for XSS issue in following notifications
Merge pull request #3791 from simong/xss-following

Fix for XSS issue in following notifications