Syncronize VisualEditor: d065bce..9d25600

Change-Id: Ia59370dd5315cfa82091c9d9e4f129519799229c