Syncronize VisualEditor: 5825389..3316a0a

Change-Id: I5b272d547275515caa59f804b5cc28774b4c505a