Merge branch 't/alsa_fix'