Syncronize VisualEditor: df31603..2b99b8a

Change-Id: Ib310ecf01f762ff7e210710a6321a84d0e851d0d