Fix #444: multiple CKEditor instances
Merge remote-tracking branch 'origin/master'