Merge playlist branch against trunk to date.