Syncronize VisualEditor: 2ac2631..370aadd

Change-Id: I4827ec4569468abb93bae6cceb59a52d8957ede8