Merge "Make audio tag cope with live streams"