Bug 13510 : Fixing the third XSS issue