Syncronize VisualEditor: ae06f75..42ba981

Change-Id: Iff8ad36cd52d815531104287edcb1c8d89b72251