Merge pull request #4444 from Wikia/VID-1915

VID-1915 Fix XSS vulnerability