Merge branch 'master' into feature/4858_msdfit_ui_upgrade

Refs #4856

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