Syncronize VisualEditor: 5b395c7..c6a1bbd

Change-Id: I13e985ad06067edba48c4589005ed9eeeb04bec5