Syncronize VisualEditor: 4ff12c7..cb0f964

Change-Id: I84cc331994bf7621ab12d87ca7bd4eb2bef32f4f