Syncronize VisualEditor: a077148..d2e5874

Change-Id: If7bee1d38cbd66906540142cc3fb8f8042fc1401