Merge pull request #4883 from ruuk/deletesound