Syncronize VisualEditor: 58ba085..ca7ef3b

Change-Id: Ia522c222355f4c472ba9b3ea66c798be4887cd11