Syncronize VisualEditor: 4bf4658..fe9f6a4

Change-Id: Ib04d0becc266fcb229a941b704248ffbd421f762