hls: update with clappr's master