Syncronize VisualEditor: 406e540..0d0b7b2

Change-Id: I793cd6fd4e1eb0081c54afb18a4f9230b3e85569