Syncronize VisualEditor: 7821eb7..99ece6e

Change-Id: Id295001f6dae17c12289c6ebfef41882ffaa76d0