Merge remote-tracking branch 'origin/feature/9777_fitfunc_attributes'
Merge remote-tracking branch 'origin/feature/9785_recycle_transmission'
Merge remote-tracking branch 'origin/master' into bugfix/9720_apply_corrections_fails_with_older_files

Refs #9720

Conflicts:
	Code/Mantid/scripts/Inelastic/IndirectDataAnalysis.py
Merge branch 'bugfix/9720_apply_corrections_fails_with_older_files' into develop

Refs #9720

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