Merge commit 'v2.6.27-rc3' into x86/prototypes