[GIT PULL] sound fixes for 3.14-rc6