Syncronize VisualEditor: 21efc99..d1b0b87

Change-Id: I18b1f4304afedfd0d4328bfa023003fbc13cefd3