Syncronize VisualEditor: 61c1f11..2fb2f44

Change-Id: I10594050425edb289c182d1ad5c3a3f820586098