Source edit for CK-Editor
Merge remote-tracking branch 'origin/master'