Merge pull request #122 from mozilla/olive-branch

check if channel broadcasts bug fix
show descriptions
Merge branch 'master' into olive-branch