Syncronize VisualEditor: cfed84e..209dbe2

Change-Id: I91f5ad7d42075f0de2db6f0795a341c5632c423b