Syncronize VisualEditor: 98d2a9c..686e294

Change-Id: I663cc34f639bfe775db07d9fa0ee9cb66a58858e