Syncronize VisualEditor: 3771aa9..30bdf71

Change-Id: Ibeec220a6ae11ad51b7cd4a20e2901fa70358299