Syncronize VisualEditor: 3ca0b1f..987b10d

Change-Id: Ieb2d9635b70f2b93a37b2411dcc82788550f4072