Merge from 65:8fcc1507a3f2

Retrofitting code to allow merging

Licel2scc calibration measurement.

(0) -30 -10 -3 +3 +10 +30 +100 tip

mercurial