Fixup "Fix chat room pruning"
Merge branch '3.0.x'