Syncronize VisualEditor: c1f2963..aa3c520

Change-Id: Icca504431ec57801c0079b8904dd93818700f0e2