Merge pull request #4601 from jmarshallnz/play_media_sort_order