Merge branch 'master' into feature/9964_apply_correction_bug

Conflicts:
	Code/Mantid/scripts/CMakeLists.txt
	Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py

Refs #9964
Merge branch 'feature/9964_apply_correction_bug' into develop

Conflicts:
	Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py

Refs #9964