Further changes to calibration.
Merge branch 'master' of private-repo