Syncronize VisualEditor: aa67dea..954fec8

Change-Id: I7ddceadeb0621dc664ae2abc65d3b862b25c90df