Merge branch 'master' into feature/9345_indirect_jumpfit_python_algorithm

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

Refs #9345
Merge branch 'feature/9345_indirect_jumpfit_python_algorithm' into develop