Syncronize VisualEditor: c961ef5..cd32648

Change-Id: Ifee7443bed9ef194ccea1a260c0d2ba8150fdd9f