Syncronize VisualEditor: a1461f2..5b395c7

Change-Id: Ib3a7daae840fd74f61eb0e0cbd5b7ad88383d69e