Syncronize VisualEditor: 9d25600..8a2b73f

Change-Id: I6ba1e5e4630cf1c834a491e5b30a0dbd48edac41