Merge pull request #7065 from colemanw/wysiwyg