Merge commit alsa/devel into topic/misc