Show live recordings instead of an old stream when applicable
Merge branch 'master' into squares