Merge pull request #4368 from jmarshallnz/music_fixes