Merge calibaration branch into master.