Syncronize VisualEditor: 21b7f64..24bcc8f

Change-Id: I13e1a2023d39cdb5dc54b7a7f78036048bf6a303