Merge branch 'mpfr'