Workaround for Firefox stream availability quirk
Merge branch 'master' into conference