Syncronize VisualEditor: 4c36d6e..40fd403

Change-Id: I554f37f6f522d0cb288a835d60341a0d1fc65dce