Merge pull request #7659 from remitamine/audimedia