Syncronize VisualEditor: b4f2b24..04abfb3

Change-Id: I4e4482150fbc92c55c5063a514b3fa3211e11973