Merge branch 'master' into bugfix/9640_load_ascii_bug

Conflicts:
	Code/Mantid/scripts/Inelastic/IndirectNeutron.py
Re #9640
Merge branch 'bugfix/9640_load_ascii_bug' into develop

Conflicts:
	Code/Mantid/scripts/Inelastic/IndirectNeutron.py
Re #9640