Syncronize VisualEditor: c964660..2786af8

Change-Id: I05bd9408fc39209520177bb47705bc368b7a6d00