Syncronize VisualEditor: 3bad2c8..921f606

Change-Id: Ia56b57de7c4e87093298c48e21cb6474d1121099