Merge pull request #1531 from rg3/no-playlist