Syncronize VisualEditor: 25d00cc..2ef5468

Change-Id: I8d77901d841e5521310c8f2154bb2681d6693835