Merge tag 'asoc-v4.2-2' into asoc-next