Syncronize VisualEditor: af84e6c..55164d4

Change-Id: Id03ebd64ac1634fd40398a5098484bdacb5eb215