Syncronize VisualEditor: b4bf8a1..226ef54

Change-Id: I150755de791f060fb366a1788b49cbc328487410