Merge tag 'asoc-v3.16-rc5' into asoc-linus