Syncronize VisualEditor: 989b7ab..2cf3c8b

Change-Id: I2f151de775a2aa3fca7313d0d20578155817c64b