Merge branch 'master' into develop
case 3851 - Fix possible XSS attack.
Merge branch 'case-3851' into develop
Merge branch 'develop'