Fix issue #204
Merge branch 'master' of github.com:galetahub/ckeditor