Syncronize VisualEditor: 80fc16a..b84bced

Change-Id: Icfb4ead4afbb1ccb8a2ecbf5a2a0aa4a87078987