not quite ready
Merge remote-tracking branch 'remotes/upstream/master'
Merge remote branch 'upstream/master'
removed ckeditor references
Merge remote branch 'upstream/master'