Syncronize VisualEditor: 3b69496..da5eacb

Change-Id: I8ee9b3e6efca83dc50e01d09d97569059b5be7aa