mpir.h -> gmp.h replacements
Merge remote branch 'origin/trunk' into trunk