Syncronize VisualEditor: 48e40fe..3806a28

Change-Id: I37cde9ae1f31466d33ae81779de0bd53b202a885