Syncronize VisualEditor: 4fd4367..e20b47f

Change-Id: I36295945a9b5f1994846ad0eb49bee845ed2e386