Syncronize VisualEditor: b7343b5..115c1b6

Change-Id: I1e1908984cb21b28d902d033c4ca074afefdee53