Syncronize VisualEditor: 7297802..6c6937a

Change-Id: Ic7012552b74ed1add3f7cecadfe707664cfabe44