Syncronize VisualEditor: 6a20e1b..5858fb6

Change-Id: If5cfd43bacd9d7b921805f8a883638b1a15cb2dc