Syncronize VisualEditor: 84fb866..2a5ac5f

Change-Id: I31e87a94e518d6751a1487095f58bf02be8efa24