Merge remote-tracking branch 'asoc/fix/mc13783' into asoc-linus