Merge pull request #8718 from remitamine/m3u8-fixup