Merge branch 'master' into feature/10007_make_resolution_calculation_more_robust

Conflicts:
	Code/Mantid/scripts/Interface/ui/reflectometer/refl_gui.py
Merge branch 'feature/10007_make_resolution_calculation_more_robust' into develop

Conflicts:
	Code/Mantid/scripts/Interface/ui/reflectometer/refl_gui.py