Syncronize VisualEditor: a498cb1..bee4e53

Change-Id: I03ba677620675ee49c67592acc5ae79bbff223db