Merge tag 'v3.19-rc7' into x86/asm, to refresh the branch before pulling in new changes