Merge remote-tracking branch 'origin/feature/9217_clang_logging'
Add Corelli IDF.
Merge remote-tracking branch 'origin/feature/9334_SCD_logs'
Merge pull request #17 from mantidproject/corelli_idf

Add Corelli IDF.
Merge remote-tracking branch 'origin/feature/9331_access_geometry_shape_from_python'
Merge remote-tracking branch 'origin/bugfix/9341_doxygen_and_ccpcheck_warnings'
Merge remote-tracking branch 'origin/feature/2480_show_required_props_and_default_vals_in_alg_diags'
Merge remote-tracking branch 'origin/master' into feature/9252_plot_axes_formatting

Conflicts:
	Code/Mantid/Framework/Kernel/inc/MantidKernel/Unit.h
	Code/Mantid/MantidQt/API/CMakeLists.txt
Refs #9252
Merge branch 'feature/9252_plot_axes_formatting' into develop

Conflicts:
	Code/Mantid/Framework/Kernel/inc/MantidKernel/Unit.h