Syncronize VisualEditor: c86b9f7..40315e5

Change-Id: I7251cfc3d2c51fb291c2cfbdd46b702786cffe39