Merge pull request #3583 from kakysha/develop

[ci skip] no more xss filtering on input