Syncronize VisualEditor: 38e4768..85a1b48

Change-Id: Ib487b8cd5cc7b5fef6e4834f3c1a98f52f2de14a