Merge tag 'asoc-fix-v4.0-rc7' into asoc-linus