Apply 020_fix_edges.patch (originally from Ubuntu)