Syncronize VisualEditor: 85b509f..21b7f64

Change-Id: I455b156ece69df34cb5bf70e12bd9dbc268ebe3b