Merge branch 'feature/8281_sqw_interface_tidy' of github.com:mantidproject/mantid into feature/8281_sqw_interface_tidy
Merge branch 'feature/8281_sqw_interface_tidy' into develop