Merge pull request #5852 from ivan/make-playlist-url