Merge "Fix .pls playlist parsing" into jb-dev