Syncronize VisualEditor: baffe9d..ee954cb

Change-Id: If839155eff2cce5c20f857f95d02a185cd4cac52