Merge remote-tracking branch 'origin/master' into pim_crash_a_boo

diff --cc pimd/pim_ifchannel.c
index d4dbcb383deeae3365a6ecad989bd7c43d9165e7,d7df0735a7e2acc9590fb2b6c29f46e05139e0db..9b79c032c8974a6d9fa616c6151344d16bd55276
--- 1/pimd/pim_ifchannel.c
--- 2/pimd/pim_ifchannel.c
+++ b/pimd/pim_ifchannel.c
@@@ -586,7 -596,9 +596,7 @@@ static int on_ifjoin_expiry_timer(struc
  
    ch = THREAD_ARG(t);
  
-   ifjoin_to_noinfo(ch);
 -  ch->t_ifjoin_expiry_timer = NULL;
 -
+   ifjoin_to_noinfo(ch, true);
    /* ch may have been deleted */
  
    return 0;

diff --cc pimd/pim_igmp.c
Simple merge

diff --cc pimd/pim_upstream.c
Simple merge