Syncronize VisualEditor: cbd3419..21efc99

Change-Id: I9935c080d8705ab41b119f5d306f3e7b6b3f58ab