Make non-confidential information plain text
Merge remote-tracking branch 'upstream/master' into wysihtml5