Merge remote-tracking branch 'origin/master' into feature/9209_can_file_in_diffraction

Refs #9209

Conflicts:
	Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py
Merge branch 'feature/9209_can_file_in_diffraction' into develop

Refs #9209

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