The patch (against 1aa095ccf) is attached.