Merge branch 'master' into feature/8116_fltabs_code_tidy

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

Refs #8116
Merge branch 'feature/8116_fltabs_code_tidy' into develop