Merge tag 'asoc-v3.14-rc3' into asoc-linus