The patch (against 758b039c0) is attached.