Merge commit '53958809' into thread-next

diff --cc nest/proto.c
index 48558865a290fb1d35ba79f12e88fa09a4e13e1c,2d30e640b2f5325b4592f60548511ffd3d2701d2..28b4426d84473ec5dfaccad6618306ebe5d96c03
--- 1/nest/proto.c
--- 2/nest/proto.c
+++ b/nest/proto.c
@@@ -617,6 -589,10 +617,12 @@@ channel_export_stopped(struct rt_export
    {
      c->refeeding = 1;
      c->refeed_pending = 0;
+ 
++    channel_reset_limit(c, &c->out_limit, PLD_OUT);
++
+     bmap_reset(&c->export_map, 1024);
+     bmap_reset(&c->export_reject_map, 1024);
+ 
      rt_request_export(c->table, req);
      return;
    }

diff --cc nest/rt-table.c
Simple merge