[GIT PULL] sound fixes for 3.15-rc2