Syncronize VisualEditor: 60808e5..80cab57

Change-Id: I8f293053271ffb54fc52376a2c167514b862f793