Syncronize VisualEditor: 2fb2f44..400a522

Change-Id: Ifb797de9054d07d5d365cfea2a1e817cb4030124