Syncronize VisualEditor: c232083..31bafa1

Change-Id: I7566e0cec0102c99657915452d08e63d281207c8