Merge remote-tracking branch 'origin/bugfix/9833_cmake_deprecated_compile_definitions_warning'
Merge remote-tracking branch 'origin/feature/10489_instrument_directories'
Merge remote-tracking branch 'origin/feature/8091_control_spawning_of_plot_windows'
Merge branch 'master' of github.com:mantidproject/mantid
Merge branch 'master' into bugfix/3493_SAVEASCII_work_with_ragged
Merge branch 'bugfix/3493_SAVEASCII_work_with_ragged' into develop