Syncronize VisualEditor: 36f95e4..7d82d17

Change-Id: Id258b9239df740f997292bb1d7821e1e3a618c56