Syncronize VisualEditor: ff7f4e8..f3cd689

Change-Id: I0787dc25513a264d81c4096a6b22b77944dec8f2