Syncronize VisualEditor: 95a7988..3d61fe7

Change-Id: I2676e8f5792f76f75dce5efb439a957f0310e848