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