Fixing some sanitization so we can encode HTML entities or else needed, but safe code, is stripped and our editors get mad at the dev team :)
Merge branch 'develop'