Syncronize VisualEditor: 6532213..6ca0046

Change-Id: I3a1f02c2bea21985d853d2aff29e4f88e82a836f