Merge commit 'b13b1d2d8692' into x86/mm