Last commit before merging playlist branch.