git pull ckeditor/ckeditor-dev stable, merged

There were changes in plugins/contextmenu/plugin.js, but the merge seemed pretty straightforward and seems to be twerkin