Fix channel dead race condition (another one)
Merge branch 'master' into animudbg