Correct live string
Merge branch 'master' into playlist