Security fix
Merge pull request #1739 from KreizIT/XssFix

Security fix