Merge commit 'v3.2-rc7' into x86/asm