Syncronize VisualEditor: 5e5eb07..2122ccb

Change-Id: Ie02ba2848feaecb6ef9dda7ae5ce0721cd5f3a51