Syncronize VisualEditor: c93f54e..684c988

Change-Id: I07d1e62fe1b03efb118adf8bfba2bc19293d3f61