Syncronize VisualEditor: 4807d4c..12f183a

Change-Id: I729de8983505e468aaa620701e3a0a1321f22755