Merge tag 'v3.17-rc4' into asoc-simple