Syncronize VisualEditor: 8aad629..bea2018

Change-Id: I122f3f13d3536aa24cf5ecf7cba89abfcd5c09c3