calibration 0.10.6
Merge pull request #2704 from vrabaud/master

calibration 0.10.6