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