Syncronize VisualEditor: 6ad2b0f..2fb3375

Change-Id: I683afffb9c990cfaec86be0990e88cd8a2917954