Reverted to the CKEditor v3; saving revisions of CMS edits
Merge branch '2013.12.10'