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

79c97ca Merge commit 'eb2b164a489eea8b2876bbb5cc7828712b3eef5d'
eb2b164 Squashed 'wysiwyg/' changes from 3157841..a9605fe
0f58aa8 Merge commit '18b7a2268d2313ce4ed8f1ef7716dcff6a223008'
18b7a22 Squashed 'wysiwyg/' changes from bd98a03..3157841
2546a9f Update core to autoinclude 'wysiwyg' class

git-subtree-dir: core
git-subtree-split: 79c97caa7146b842796885e888e77d01e58c2fdd
Merge commit 'f971526112a30af6c574fc5629b992d6df835b20'