Syncronize VisualEditor: 3871ba5..7d22867

Change-Id: I8fd236d82b77486fdaff1701c41dc9e37ce38403