Merge master into benchmarkCFRAC2017.

Benoît LÉ requested to merge benchmarkCFRAC2017Merge into benchmarkCFRAC2017

Merge branch master into benchmarkCFRAC2017 to make it usable with recent evolutions of the code.

Merge request reports