Merge branch 'tip-x86-fpu' into rc1+