Syncronize VisualEditor: 17077ad..3b8f850

Change-Id: I6ce9a51db07249f08203af18b522424a3f9c7210