Merge pull request #6791 from remitamine/musicvault