Syncronize VisualEditor: 2122ccb..21ab1a9

Change-Id: I3efbd906d5397919f98290ed8abe2b2d6ac6983a