Syncronize VisualEditor: e085a96..00af434

Change-Id: Ia33d3e98cd5841839818efffe5a8a9f2705c7170