Merge remote branch 'origin/bugfix/7443_save_dialog_file_extension_bug'
Merge remote-tracking branch 'origin/feature/7387_calibration_review'
Merge remote-tracking branch 'origin/feature/4489_divide_error_improve'
Merge remote-tracking branch 'origin/feature/7445_reflectometry_q'
Merge remote branch 'origin/feature/7463_remove_runoldpythonscript'
Merge remote-tracking branch 'origin/feature/7426_gss_specid'
Merge remote-tracking branch 'origin/feature/7399_update_indirect_convfit'
Merge remote-tracking branch 'origin/master' into feature/7437_doc_calibration
Merge remote-tracking branch 'origin/master' into feature/7437_doc_calibration

Conflicts:
	Code/Mantid/scripts/Calibration/tube.py

It was necessary to merge master into 7437 to solve conflicts.

re #7437
Merge branch 'feature/7437_doc_calibration' into develop