Syncronize VisualEditor: 8005868..36caeb4

Change-Id: I7f46b7b23c76c33259de649f4b8c91d4e0cf9ad0