Merge branch 'x86/mpparse' into x86/devel