Syncronize VisualEditor: 6cd473b..fbc7ecb

Change-Id: Ieab5a4c0f3a4b94fada95ddcc128002717235070