Syncronize VisualEditor: 2c60bbe..61ac4c0

Change-Id: I002695fb659bd9a53e74f651cb288bed87381c3a