Syncronize VisualEditor: f30c4d6..c2c0466

Change-Id: I707505dd41cd7fa63878c406749656ff05bccfea