Merge remote-tracking branch 'jeff/fix_calibrator'

Conflicts:
	src/main_common.cpp