Merge remote-tracking branch 'origin/feature/8723_read_Spectrum'
Merge remote-tracking branch 'origin/feature/9097_tube_calib_file'
Merge remote-tracking branch 'origin/feature/8601_getdetoffsets_more_stat'
Merge remote-tracking branch 'origin/feature/8816_PredictPeaks_SCDInterface'
Merge remote-tracking branch 'origin/feature/9064_SetInstrumentParameter'
Merge remote branch 'origin/feature/9142_conditional_enabling_DSFinterp'
Merge remote branch 'origin/bugfix/9119_muon_coverity_issues'
Merge remote-tracking branch 'origin/feature/8264_disable_icat_download'
Merge branch 'master' into feature/5300_moments_sqw_tab

Refs #5300

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
	Code/Mantid/MantidQt/CustomInterfaces/src/Indirect.cpp
Merge branch 'feature/5300_moments_sqw_tab' into develop

Refs #5300

Conflicts:
	Code/Mantid/MantidQt/CustomInterfaces/CMakeLists.txt
	Code/Mantid/MantidQt/CustomInterfaces/src/Indirect.cpp