Syncronize VisualEditor: 3acca7c..8b25cb9

Change-Id: Ic3005d3ecb7594ea2ec1b6d3e0d897c172c29d30