Syncronize VisualEditor: 21ab1a9..350c99e

Change-Id: I0a2ac9251a7d48f32f9ff609e2cc9ea47f83720b