Merge pull request #3614 from elupus/audio_clean