Merge commit '946386f2' into thread-next

diff --cc proto/mrt/mrt.c
index ff3b022794d0c4de576da53ac42069899e7013da,1336837a80f4621fc7512db3f38b33b2706af7f9..cc5ad06a6c35f2af1802b11738411f198ef7744a
--- 1/proto/mrt/mrt.c
--- 2/proto/mrt/mrt.c
+++ b/proto/mrt/mrt.c
@@@ -628,11 -591,13 +628,14 @@@ mrt_table_dump_free(struct mrt_table_du
  }
  
  
 -static int
 -mrt_table_dump_step(struct mrt_table_dump_state *s)
 +static void
 +mrt_table_dump_step(void *_s)
  {
-   struct bgp_write_state bws = { .as4_session = 1 };
 +  struct mrt_table_dump_state *s = _s;
+   struct bgp_write_state bws = {
+     .as4_session = 1,
+     .ignore_non_bgp_attrs = 1,
+   };
  
    s->max = 2048;
    s->bws = &bws;