calibration 0.10.11
Merge pull request #5773 from vrabaud/master

calibration 0.10.11