small refactor to include_event (William Casarin)

Add thread muting (Terry Yiu)

pushed to refs/heads/master