Syncronize VisualEditor: 5a3c2a9..2d3bf97

Change-Id: I819a31df8347f52043d76b5147d3eb54480a7640