Syncronize VisualEditor: de0091f..21b4249

Change-Id: Ie2a8b2caf8b6caf4c0c8735e94abfe44088e60ae