Merge branch 'security/fix-html-class-scrubbing' into 'develop'