Merge pull request #157 from Alexpux/develop

Sync develop with master branch
Merge pull request #158 from Alexpux/develop

Backport from master branch
Update mpfr to 3.1.2