Merge tag 'v4.7-rc1' into patchwork