comment about ending a stream
origin server target
Merge remote-tracking branch 'origin/master'

Conflicts:
	hls.py
	locustfile.py
return if master playlist can't be downloaded