Merge branch 'master', remote-tracking branch 'origin' into feature/9390_convert_empty_to_tof
Re #9390 Validate spectra and channel inputs.
Merge branch 'feature/9390_convert_empty_to_tof' of github.com:mantidproject/mantid into feature/9390_convert_empty_to_tof