Squashed 'core/' changes from 79c97ca..ff02683

ff02683 Temporary disable wysiwyg

git-subtree-dir: core
git-subtree-split: ff02683f95e57520e3fbf750c57b82c801b9d754
Merge commit '6976f9a40b3c739f4ae6b16362fbb015189571b9'