Merge Gavin van Lelyveld's patch for --playlist-start option