Merge branch 'x86/cleanups'