Syncronize VisualEditor: 85a1b48..265de12

Change-Id: Ia4ce54a014d64d14521b033abe9b1b9fc161ce60