calibration 0.10.4
Merge pull request #2649 from vrabaud/master

calibration 0.10.4