Syncronize VisualEditor: 8348009..20b5c40

Change-Id: Ib6b8702fa37a9b7e87315fcaf66e6dd5e1d5ab4e