Syncronize VisualEditor: 4862818..84fb866

Change-Id: Iacadcffe256329f1d9be082ab6ddeb8867d1cd48