Syncronize VisualEditor: 17f3930..c839618

Change-Id: Ic7d52be7e61e0385277fac8f533e70246d26a810