Merge tag 'v3.7-rc6' into asoc-wm2200