Merge branch 'master' of github.com:mantidproject/mantid into feature/9390_convert_empty_to_tof
Re #9390 New doc format.
Merge branch 'feature/9390_convert_empty_to_tof' into develop