Merge remote-tracking branch 'origin/bugfix/7416_slice_view_table_precision'
Merge remote-tracking branch 'origin/feature/7222_share_drawing_tools'
Merge remote-tracking branch 'origin/feature/6967_cosmetic_CMD'
Merge remote-tracking branch 'origin/feature/7507_SpeedUp_ILL_Loaders'
Merge remote-tracking branch 'origin/feature/6896_new_unit_test'
Merge remote-tracking branch 'origin/bugfix/7533_revert_changes_renameworkspace'
Merge remote-tracking branch 'origin/feature/5572_filter_peaks'
Merge remote-tracking branch 'origin/feature/6791_osiris_diffspec_mode'
Merge remote-tracking branch 'origin/feature/7486_IgnoreMDBoxIDComparing'
Merge remote-tracking branch 'origin/bugfix/7510_sofqw_widths_nonpsd'
Merge remote-tracking branch 'origin/feature/7385_sliceview_column_label'
Re #7385. Merge branch 'master' of github.com:mantidproject/mantid
Merge remote-tracking branch 'origin/feature/7013_expose_peaksviewer'
Merge remote-tracking branch 'feature/6667_ISISReductionInMantid'

Refs #6667
Conflicts:
	Code/Mantid/scripts/CMakeLists.txt
	Code/Mantid/scripts/Inelastic/DirectEnergyConversion.py
Merge remote-tracking branch 'origin/bugfix/7459_filter_log'
Merge remote-tracking branch 'origin/bugfix/7524_basis_loading_error'
Merge remote branch 'origin/feature/7169_DGS_file'
Re #7547. Move dgs_utils.py to python v2 API.

This was harder than foreseen because of all the unicode around here,
which our Python API really doesn't like!
Merge branch 'feature/7547_dgs_utils_to_v2' into develop

Re #7547.
Conflicts:
	Code/Mantid/scripts/CMakeLists.txt