Support for calibrate option
Merge branch 'unstable' of /data/proj/SAF/GIT/mpop into unstable
Merge commit '7a1168b36b20015913d9f52aa2008c701fb2e7d1' into HEAD