Syncronize VisualEditor: dc5d735..d99ae6d

Change-Id: I2eb4391efabe47cf502a9a24e5d55431b8bb7dc8