calibration 0.10.0
Merge pull request #1565 from vrabaud/master

calibration 0.10.0