Syncronize VisualEditor: c2e1766..a857e30

Change-Id: Iccfcb030af5908824dd8ca967091faacbdf0237d