Syncronize VisualEditor: 2407129..8d99aa8

Change-Id: I09efd3056fdeb82bff4d1696eb15ece0c537c5b9