Syncronize VisualEditor: 21b4249..9e522c6

Change-Id: I9ea4ef8d7b7d48960e1a22bb199a4ed67c1605ae