calibration 0.10.5
Merge pull request #2652 from vrabaud/master

calibration 0.10.5