calibration 0.10.13
Merge pull request #6621 from vrabaud/master

calibration 0.10.13