http_stream -> hls_stream
Merge branch 'master' into paleo